arrest 0.0.8 → 0.0.9

data/arrest.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "faraday", '0.7.5'
+  s.add_runtime_dependency "activemodel", '~> 3'
 
   s.add_development_dependency 'bundler', '>= 1.0.0'
   s.add_development_dependency 'rake'

data/lib/arrest/abstract_resource.rb

@@ -1,11 +1,13 @@
 require 'json'
 require 'arrest/string_utils'
 require 'time'
+require 'active_model'
 
 Scope = Struct.new(:name, :block)
 
 module Arrest
   class AbstractResource
+    extend ActiveModel::Naming
     include HasAttributes
     attribute :id, String
     class << self

data/lib/arrest/attributes/belongs_to.rb

@@ -16,8 +16,10 @@ module Arrest
         if params
           field_name = params[:field_name] unless params[:field_name] == nil
           class_name = params[:class_name].to_s unless params[:class_name] == nil
+          read_only =  params[:read_only] == true
         end
         attributes({field_name.to_sym => String})
+        add_attribute(Attribute.new(field_name.to_sym, read_only, String))
         send :define_method, name do
           val = self.send(field_name)
           begin

data/lib/arrest/helper/child_collection.rb

@@ -1,5 +1,5 @@
 module Arrest
-  class ChildCollection < BasicObject
+  class ChildCollection #< BasicObject
     def initialize parent, clazz_name
       @parent = parent
       @clazz_name = clazz_name
@@ -12,12 +12,18 @@ module Arrest
 
     def method_missing(*args, &block)
      if resolved_class.respond_to?(args[0])
-       resolved_class.send(args[0], @parent)
+       sub_args = [@parent]
+       sub_args += args.drop(1)
+       resolved_class.send(args[0], *sub_args)
      else
        children.send(*args, &block)
      end
     end
 
+    def inspect
+      children.inspect
+    end
+
     private
 
 

data/lib/arrest/rest_child.rb

@@ -38,6 +38,18 @@ module Arrest
         self.build body
       end
 
+      def filter name, &aproc
+        if aproc != nil
+          send :define_singleton_method, name do |*args|
+            self.all_for(args[0]).select do |instance|
+              instance.instance_exec(*(args.drop(1)), &aproc)
+            end
+          end
+        else
+          raise "You must specify a block for a filter"
+        end
+      end
+
       def scope name, &block
         super name
         if block_given?

data/lib/arrest/root_resource.rb

@@ -24,6 +24,18 @@ module Arrest
         self.build body.merge({:id => id})
       end
 
+      def filter name, &aproc
+        if aproc != nil
+          send :define_singleton_method, name do |args|
+            self.all.select do |instance|
+              instance.instance_exec(args, &aproc)
+            end
+          end
+        else
+          raise "You must specify a block for a filter"
+        end
+      end
+
       def scope name, &block
         super(name)
         if block_given?

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/models.rb

@@ -67,3 +67,20 @@ class CustomNamedBelongsTo < Arrest::RootResource
   belongs_to :zoo_thing, { :field_name => :schinken, :class_name => :Zoo}
   belongs_to :zoo, { :field_name => :batzen}
 end
+
+class ParentFilter < Arrest::RootResource
+  attribute :id, String
+  attribute :afield, String
+
+  filter(:nnn) {|s| afield == s}
+  has_many :child_filters
+end
+
+class ChildFilter < Arrest::RestChild
+  attribute :id, String
+  attribute :bfield, String
+
+  parent :parent_filter
+
+  filter(:child_nnn) {|s| bfield == s}
+end

data/test/unit.rb

@@ -5,7 +5,7 @@ class FirstTest < Test::Unit::TestCase
 
   def setup
      Arrest::Source.source = nil
-     Arrest::Source.debug = true
+     #Arrest::Source.debug = true
   end
 
   def test_mem_src
@@ -15,10 +15,8 @@ class FirstTest < Test::Unit::TestCase
   end
 
   def test_init
-    puts "test_init NOWWWWWW #{Arrest::Source::source.objects.length}"
     zooname =  "Hagenbecks"
     z = Zoo.new({:name => zooname})
-    puts "aaa #{z.attribute_values.inspect}"
     assert_equal zooname, z.name
     #assert_not_empty Arrest::AbstractResource.all_fields.select {|f| f.name == :id}, "AbstractResource defines the id field itself"
     #assert_not_empty Arrest::RootResource.all_fields.select {|f| f.name == :id}, "RootResource should inherit id from AbstractResource"
@@ -106,7 +104,6 @@ class FirstTest < Test::Unit::TestCase
     assert new_animal.id != nil
 
     zoo_reloaded = Zoo.find(new_zoo.id)
-    puts "--1 #{zoo_reloaded.to_hash}"
     assert_equal new_zoo.id, zoo_reloaded.id
     assert_equal new_animal.parent.id, zoo_reloaded.id
 
@@ -140,7 +137,6 @@ class FirstTest < Test::Unit::TestCase
   end
 
   def test_inheritance
-    puts "NOWWWWWW #{Arrest::Source::source.objects.length}"
     new_zoo = SpecialZoo.new({:name => "Foo", :is_magic => true})
     assert_equal "Foo", new_zoo.name
     assert_equal true, new_zoo.is_magic
@@ -274,5 +270,32 @@ class FirstTest < Test::Unit::TestCase
     assert_equal true, Zoo.all.first.animals.males_only.first.male
 
   end
+
+  def test_para_filter
+    p1 = ParentFilter.new({:afield => "Foo"})
+    p2 = ParentFilter.new({:afield => "Bar"})
+    p1.save
+    p2.save
+
+    nnn = ParentFilter.nnn("Foo")
+    assert_equal ["Foo"], nnn.map(&:afield)
+  end
+
+  def test_para_filter_child
+    p1 = ParentFilter.new({:afield => "ParentFoo"})
+    p1.save
+
+    c1 = ChildFilter.new(p1, :bfield => "Foo") 
+    c1.save
+    c2 = ChildFilter.new(p1, :bfield => "Bar") 
+    c2.save
+
+    reloaded_parent = ParentFilter.find(p1.id)
+    assert_not_nil reloaded_parent
+    assert_equal "ParentFoo", reloaded_parent.afield
+    assert_equal 2, reloaded_parent.child_filters.length
+
+    assert_equal ["Foo"], reloaded_parent.child_filters.child_nnn("Foo").map(&:bfield)
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2011-12-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2154088800 !ruby/object:Gem::Requirement
+  requirement: &12008120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154088800
+  version_requirements: *12008120
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2154087020 !ruby/object:Gem::Requirement
+  requirement: &12006980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,21 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *2154087020
+  version_requirements: *12006980
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &12006180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *12006180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154085760 !ruby/object:Gem::Requirement
+  requirement: &12005700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2154085760
+  version_requirements: *12005700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154084940 !ruby/object:Gem::Requirement
+  requirement: &12005200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154084940
+  version_requirements: *12005200
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2154083900 !ruby/object:Gem::Requirement
+  requirement: &12004460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154083900
+  version_requirements: *12004460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154082700 !ruby/object:Gem::Requirement
+  requirement: &12003960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2154082700
+  version_requirements: *12003960
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2154082100 !ruby/object:Gem::Requirement
+  requirement: &12003540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154082100
+  version_requirements: *12003540
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2154081620 !ruby/object:Gem::Requirement
+  requirement: &12003020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154081620
+  version_requirements: *12003020
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2154081180 !ruby/object:Gem::Requirement
+  requirement: &12002560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154081180
+  version_requirements: *12002560
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -169,11 +180,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/has_attributed.rb
-- test/models.rb
-- test/nested_resource.rb
-- test/unit.rb
+test_files: []