arrest 0.0.49 → 0.0.50

data/lib/arrest.rb

@@ -20,6 +20,7 @@ require "arrest/helper/filter"
 require "arrest/helper/child_collection"
 require "arrest/helper/has_many_collection"
 require "arrest/helper/ordered_collection"
+require "arrest/helper/has_many"
 require "arrest/exceptions"
 require "arrest/http_source"
 require "arrest/mem_source"

data/lib/arrest/abstract_resource.rb

@@ -73,6 +73,7 @@ module Arrest
     include ActiveModel::Dirty
     extend ActiveModel::Translation
     include HasAttributes
+    include HasMany
     attribute :id, String
 
     attr_accessor :context
@@ -131,60 +132,6 @@ module Arrest
         end
       end
 
-      def has_many(*args)
-        method_name, options = args
-        ids_field_name = (StringUtils.singular(method_name.to_s) + '_ids').to_sym
-        method_name = method_name.to_sym
-        clazz_name = StringUtils.singular(method_name.to_s)
-        foreign_key = clazz_name + "_id"
-        sub_resource = false
-        read_only = false
-        url_part = method_name.to_s
-        if options
-          clazz_name = options[:class_name].to_s unless options[:class_name] == nil
-          foreign_key = "#{StringUtils.underscore(clazz_name)}_id"
-          foreign_key = options[:foreign_key].to_s unless options[:foreign_key] == nil
-          sub_resource = !!options[:sub_resource]
-          read_only = options[:read_only]
-          url_part = options[:url_part].to_s unless options[:url_part] == nil
-        end
-
-        hm_attr = create_has_many_attribute(sub_resource, # e.g. 'team_ids' attribute for 'has_many :teams'
-                                            ids_field_name,
-                                            method_name,
-                                            clazz_name,
-                                            url_part,
-                                            foreign_key,
-                                            read_only)
-        add_attribute(hm_attr)
-
-        send :define_method, method_name do # e.g. define 'teams' method for notation 'has_many :teams'
-          @has_many_collections ||= {}
-          @has_many_collections[method_name] ||= HasManyCollection.new(self, hm_attr)
-          @has_many_collections[method_name]
-        end
-      end
-
-      def create_has_many_attribute(sub_resource, ids_field_name, method_name,
-                                    clazz_name, url_part, foreign_key, read_only)
-        if sub_resource
-          define_attribute_methods [ids_field_name]
-          return HasManySubResourceAttribute.new(ids_field_name,
-                                                 method_name,
-                                                 clazz_name,
-                                                 url_part,
-                                                 foreign_key,
-                                                 read_only)
-        else
-          return HasManyAttribute.new(ids_field_name,
-                                      method_name,
-                                      clazz_name,
-                                      url_part,
-                                      foreign_key,
-                                      read_only)
-        end
-      end
-
       def children(*args)
         method_name, options = args
         method_name = method_name.to_sym
@@ -199,7 +146,7 @@ module Arrest
 
         send :define_method, method_name do
           @child_collections ||= {}
-          @child_collections[method_name] ||= ChildCollection.new(self, (StringUtils.classify (StringUtils.singular clazz_name)))
+          @child_collections[method_name] ||= ChildCollection.new(self, (StringUtils.classify(StringUtils.singular clazz_name)))
           @child_collections[method_name]
         end
       end

data/lib/arrest/helper/has_many.rb

@@ -0,0 +1,66 @@
+module Arrest
+  module HasMany
+    include Arrest::HasAttributes
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def has_many(*args)
+        method_name, options = args
+        ids_field_name = (StringUtils.singular(method_name.to_s) + '_ids').to_sym
+        method_name = method_name.to_sym
+        clazz_name = StringUtils.singular(method_name.to_s)
+        foreign_key = clazz_name + "_id"
+        sub_resource = false
+        read_only = false
+        url_part = method_name.to_s
+        if options
+          clazz_name = options[:class_name].to_s unless options[:class_name] == nil
+          foreign_key = "#{StringUtils.underscore(clazz_name)}_id"
+          foreign_key = options[:foreign_key].to_s unless options[:foreign_key] == nil
+          sub_resource = !!options[:sub_resource]
+          read_only = options[:read_only]
+          url_part = options[:url_part].to_s unless options[:url_part] == nil
+        end
+
+        hm_attr = create_has_many_attribute(sub_resource, # e.g. 'team_ids' attribute for 'has_many :teams'
+                                            ids_field_name,
+                                            method_name,
+                                            clazz_name,
+                                            url_part,
+                                            foreign_key,
+                                            read_only)
+        add_attribute(hm_attr)
+
+        send :define_method, method_name do # e.g. define 'teams' method for notation 'has_many :teams'
+          @has_many_collections ||= {}
+          @has_many_collections[method_name] ||= HasManyCollection.new(self, hm_attr)
+          @has_many_collections[method_name]
+        end
+      end
+
+      def create_has_many_attribute(sub_resource, ids_field_name, method_name,
+                                    clazz_name, url_part, foreign_key, read_only)
+        if sub_resource
+          define_attribute_methods [ids_field_name]
+          return HasManySubResourceAttribute.new(ids_field_name,
+                                                 method_name,
+                                                 clazz_name,
+                                                 url_part,
+                                                 foreign_key,
+                                                 read_only)
+        else
+          return HasManyAttribute.new(ids_field_name,
+                                      method_name,
+                                      clazz_name,
+                                      url_part,
+                                      foreign_key,
+                                      read_only)
+        end
+      end
+    end
+
+  end
+end

data/lib/arrest/helper/has_many_collection.rb

@@ -1,8 +1,8 @@
 module Arrest
   class HasManyCollection #< BasicObject
 
-    def initialize(parent, has_many_attribute)
-      @parent = parent
+    def initialize(abstract_resource, has_many_attribute)
+      @parent = abstract_resource
       @clazz_name = (StringUtils.classify(has_many_attribute.clazz_name.to_s))
       @url_part = has_many_attribute.url_part
       @children = nil
@@ -41,7 +41,7 @@ module Arrest
       else
         new_page = 1
       end
-      if new_page != @page 
+      if new_page != @page
         @children = nil
       end
       @page = new_page

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.49"
+  VERSION = "0.0.50"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.49
+  version: 0.0.50
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000Z
+date: 2012-05-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2164460740 !ruby/object:Gem::Requirement
+  requirement: &8844920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164460740
+  version_requirements: *8844920
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2164460240 !ruby/object:Gem::Requirement
+  requirement: &8839500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *2164460240
+  version_requirements: *8839500
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2164459740 !ruby/object:Gem::Requirement
+  requirement: &8889900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2164459740
+  version_requirements: *8889900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164459280 !ruby/object:Gem::Requirement
+  requirement: &10680020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2164459280
+  version_requirements: *10680020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164458900 !ruby/object:Gem::Requirement
+  requirement: &10695600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164458900
+  version_requirements: *10695600
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2164458440 !ruby/object:Gem::Requirement
+  requirement: &10700420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164458440
+  version_requirements: *10700420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164457940 !ruby/object:Gem::Requirement
+  requirement: &10707620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2164457940
+  version_requirements: *10707620
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2164457520 !ruby/object:Gem::Requirement
+  requirement: &11478380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164457520
+  version_requirements: *11478380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2164457060 !ruby/object:Gem::Requirement
+  requirement: &12979520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164457060
+  version_requirements: *12979520
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2158326960 !ruby/object:Gem::Requirement
+  requirement: &13647440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158326960
+  version_requirements: *13647440
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -150,6 +150,7 @@ files:
 - lib/arrest/handler.rb
 - lib/arrest/helper/child_collection.rb
 - lib/arrest/helper/filter.rb
+- lib/arrest/helper/has_many.rb
 - lib/arrest/helper/has_many_collection.rb
 - lib/arrest/helper/logger.rb
 - lib/arrest/helper/ordered_collection.rb
@@ -195,13 +196,4 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Another ruby rest client
-test_files:
-- spec/arrest_spec.rb
-- spec/spec_helper.rb
-- spec/support/models/user.rb
-- test/context.rb
-- test/has_attributed.rb
-- test/models.rb
-- test/nested_resource.rb
-- test/unit.rb
-- test/validations.rb
+test_files: []