oat 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2d910f58530d5cbf88e106998c333704b15237f
-  data.tar.gz: 4aeb7c7638228de5debc7fdfca5adf68e7b311ea
+  metadata.gz: e91756d324b28991b10b9b78aad3dac169ff75ef
+  data.tar.gz: 64cb4030b9179913f78b575848f4f80a919f26e1
 SHA512:
-  metadata.gz: 61302f48f109b9f6d354b858aff022d06e5df6d182d7c51f423e9d3b05990b1b677e5917661784bb57fcebdc683cfbf1b581402b7e5bb9eb6a936a8cd535d264
-  data.tar.gz: 43bcffc5b42c3782246f2b388cacb9bbe1ac733d16d19150701dbad4b7f95f32451e7b3e901e4d11a6714286490c1c102d66e8edb1aabb27325b4bacfdf860ad
+  metadata.gz: '08264457ae25d020fa01992d7854945d1c553d0e6c8fd5be02cb0641a3daa03195f182bf0bf15ee047e571f11dfe1c18637ee9711b16513eee8195daebdc16fa'
+  data.tar.gz: 4e96b9fcf7bf646a289ff692f7fb7e5b70e4c8becb57258b65e24790327c87b0dc3477f8a4961da17bc24c1375a8a3bdd39b55cea513a02126a368637ea6c164

data/CHANGELOG.md

@@ -1,8 +1,7 @@
 # Change Log
 
-## [Unreleased](https://github.com/ismasan/oat/tree/HEAD)
-
-[Full Changelog](https://github.com/ismasan/oat/compare/v0.5.0...HEAD)
+## [v0.5.1](https://github.com/ismasan/oat/tree/v0.5.1) (2017-06-06)
+[Full Changelog](https://github.com/ismasan/oat/compare/v0.5.0...v0.5.1)
 
 **Merged pull requests:**
 

data/lib/oat/adapters/json_api.rb

@@ -1,12 +1,4 @@
 # http://jsonapi.org/format/#url-based-json-api
-require 'active_support/inflector'
-require 'active_support/core_ext/string/inflections'
-unless defined?(String.new.pluralize)
-  class String
-    include ActiveSupport::CoreExtensions::String::Inflections
-  end
-end
-
 module Oat
   module Adapters
 
@@ -24,7 +16,7 @@ module Oat
       end
 
       def type(*types)
-        @root_name = types.first.to_s.pluralize.to_sym
+        @root_name = pluralize(types.first.to_s).to_sym
       end
 
       def link(rel, opts = {})
@@ -74,7 +66,7 @@ module Oat
         if ent
           ent_hash = ent.to_hash
           _name = entity_name(name)
-          link_name = _name.to_s.pluralize.to_sym
+          link_name = pluralize(_name.to_s).to_sym
           data[:links][_name] = ent_hash[:id]
 
           entity_hash[link_name] ||= []
@@ -87,7 +79,7 @@ module Oat
       def entities(name, collection, serializer_class = nil, context_options = {}, &block)
         return if collection.nil? || collection.empty?
         _name = entity_name(name)
-        link_name = _name.to_s.pluralize.to_sym
+        link_name = pluralize(_name.to_s).to_sym
         data[:links][link_name] = []
 
         collection.each do |obj|
@@ -155,6 +147,15 @@ module Oat
         ent.to_hash.values.first.first if ent
       end
 
+      PLURAL = /s$/
+
+      def pluralize(str)
+        if str =~ PLURAL
+          str
+        else
+          "#{str}s"
+        end
+      end
     end
   end
 end

data/lib/oat/serializer.rb

@@ -2,7 +2,7 @@ require 'support/class_attribute'
 
 module Oat
   class Serializer
-
+    extend ClassAttribute
     class_attribute :_adapter, :logger, :schemas, :schema_methods
 
     self.schemas = []

data/lib/oat/version.rb

@@ -1,3 +1,3 @@
 module Oat
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/support/class_attribute.rb

@@ -1,66 +1,37 @@
-begin
-  require 'active_support/core_ext/class/attribute'
-rescue LoadError
-  module Kernel
-    # Returns the object's singleton class.
-    def singleton_class
-      class << self
-        self
-      end
-    end unless respond_to?(:singleton_class) # exists in 1.9.2
-
-    # class_eval on an object acts like singleton_class.class_eval.
-    def class_eval(*args, &block)
-      singleton_class.class_eval(*args, &block)
-    end
-  end
-
-  class Module
-    def remove_possible_method(method)
-      if method_defined?(method) || private_method_defined?(method)
-        remove_method(method)
-      end
-    rescue NameError
-      # If the requested method is defined on a superclass or included module,
-      # method_defined? returns true but remove_method throws a NameError.
-      # Ignore this.
-    end
-
-    def redefine_method(method, &block)
-      remove_possible_method(method)
-      define_method(method, &block)
-    end
-  end
-
-  class Class
+module Oat
+  module ClassAttribute
     def class_attribute(*attrs)
       attrs.each do |name|
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def self.#{name}() nil end
-          def self.#{name}?() !!#{name} end
+            def self.#{name}() nil end
 
-          def self.#{name}=(val)
-            singleton_class.class_eval do
-              remove_possible_method(:#{name})
-              define_method(:#{name}) { val }
-            end
+            def self.#{name}=(val)
+              singleton_class.class_eval do
+                define_method(:#{name}) { val }
+              end
 
-            if singleton_class?
-              class_eval do
-                remove_possible_method(:#{name})
-                def #{name}
-                  defined?(@#{name}) ? @#{name} : singleton_class.#{name}
+              if singleton_class?
+                class_eval do
+                  def #{name}
+                    defined?(@#{name}) ? @#{name} : singleton_class.#{name}
+                  end
                 end
               end
+              val
             end
-            val
-          end
         RUBY
 
       end
     end
 
     private
+
+    def singleton_class
+      class << self
+        self
+      end
+    end unless respond_to?(:singleton_class) # exists in 1.9.2
+
     def singleton_class?
       ancestors.first != self
     end

data/oat.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ">= 3.0"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: oat
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -97,13 +83,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/Gemfile.as-1.4.4
-- gemfiles/Gemfile.as-2.3.x
-- gemfiles/Gemfile.as-3.0.x
-- gemfiles/Gemfile.as-3.1.x
-- gemfiles/Gemfile.as-3.2.x
-- gemfiles/Gemfile.as-4.0.x
-- gemfiles/Gemfile.as-4.1.x
 - lib/oat.rb
 - lib/oat/adapter.rb
 - lib/oat/adapters/hal.rb
@@ -140,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Adapters-based serializers with Hypermedia support

data/gemfiles/Gemfile.as-1.4.4

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in oat.gemspec
-gem 'activesupport', '1.4.4'
-gem 'rake', '< 10.2'
-gemspec :path => "../"

data/gemfiles/Gemfile.as-2.3.x

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in oat.gemspec
-gem 'activesupport', '~>2.3.18'
-gem 'rake', '< 10.2'
-gemspec :path => "../"

data/gemfiles/Gemfile.as-3.0.x

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in oat.gemspec
-gem 'i18n', '0.6.9'
-gem 'activesupport', '~>3.0.20'
-gem 'rake', '< 10.2'
-gemspec :path => "../"

data/gemfiles/Gemfile.as-3.1.x

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in oat.gemspec
-gem 'i18n', '0.6.9'
-gem 'activesupport', '~>3.1.12'
-gem 'rake', '< 10.2'
-gemspec :path => "../"

data/gemfiles/Gemfile.as-3.2.x

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in oat.gemspec
-gem 'i18n', '0.6.9'
-gem 'activesupport', '~>3.2.16'
-gem 'rake', '< 10.2'
-gemspec :path => "../"

data/gemfiles/Gemfile.as-4.0.x

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in oat.gemspec
-gem 'activesupport', '~>4.0.2'
-gemspec :path => "../"

data/gemfiles/Gemfile.as-4.1.x

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in oat.gemspec
-gem 'activesupport', '~>4.1.4'
-gemspec :path => "../"