arrest 0.0.1 → 0.0.2

data/arrest.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "json"
 end

data/lib/arrest.rb

@@ -1,5 +1,6 @@
 require "arrest/version"
 
+require "arrest/source"
 require "arrest/http_source"
 require "arrest/mem_source"
 require "arrest/abstract_resource"
@@ -8,11 +9,51 @@ require "arrest/rest_child"
 
 module Arrest
 
-  class Source 
-  
-    cattr_accessor :source
+  String.class_eval do
 
-  end
-  Source.source= MemSource.new
+    PLURALS = [['(quiz)$', '\1zes'],['(ox)$', '\1en'],['([m|l])ouse$', '\1ice'],['(matr|vert|ind)ix|ex$', '\1ices'],
+      ['(x|ch|ss|sh)$', '\1es'],['([^aeiouy]|qu)ies$', '\1y'],['([^aeiouy]|q)y$$', '\1ies'],['(hive)$', '\1s'],
+      ['(?:[^f]fe|([lr])f)$', '\1\2ves'],['(sis)$', 'ses'],['([ti])um$', '\1a'],['(buffal|tomat)o$', '\1oes'],['(bu)s$', '\1es'],
+      ['(alias|status)$', '\1es'],['(octop|vir)us$', '\1i'],['(ax|test)is$', '\1es'],['s$', 's'],['$', 's']]
+    SINGULARS =[['(quiz)zes$', '\1'],['(matr)ices$', '\1ix'],['(vert|ind)ices$', '\1ex'],['^(ox)en$', '\1'],['(alias|status)es$', '\1'],
+      ['(octop|vir)i$', '\1us'],['(cris|ax|test)es$', '\1is'],['(shoe)s$', '\1'],['[o]es$', '\1'],['[bus]es$', '\1'],['([m|l])ice$', '\1ouse'],
+      ['(x|ch|ss|sh)es$', '\1'],['(m)ovies$', '\1ovie'],['[s]eries$', '\1eries'],['([^aeiouy]|qu)ies$', '\1y'],['[lr]ves$', '\1f'],
+      ['(tive)s$', '\1'],['(hive)s$', '\1'],['([^f])ves$', '\1fe'],['(^analy)ses$', '\1sis'],
+      ['([a]naly|[b]a|[d]iagno|[p]arenthe|[p]rogno|[s]ynop|[t]he)ses$', '\1\2sis'],['([ti])a$', '\1um'],['(news)$', '\1ews'], ['(.*)s$', '\1'], ['^(.*)$', '\1']]
+
+    def singular()
+      SINGULARS.each { |match_exp, replacement_exp| return gsub(Regexp.compile(match_exp), replacement_exp) unless match(Regexp.compile(match_exp)).nil?}
+    end
+
+    def plural()
+      PLURALS.each   { |match_exp, replacement_exp| return gsub(Regexp.compile(match_exp), replacement_exp) unless match(Regexp.compile(match_exp)).nil? }
+    end
 
+    def plural?
+      PLURALS.each {|match_exp, replacement_exp| return true if match(Regexp.compile(match_exp))}
+      false
+    end
+
+    def blank? 
+      self == nil || self == ""
+    end
+
+    def classify(upper_first = true)
+      result = ""
+      upperNext = false
+      self.singular.each_char do |c|
+        if c == "_"
+          upperNext = true
+        else
+          if upperNext || (result.blank? && upper_first)
+            result << c.upcase
+          else
+            result << c
+          end
+          upperNext = false
+        end
+      end
+      result
+    end
+  end
 end

data/lib/arrest/abstract_resource.rb

@@ -1,42 +1,113 @@
+require 'json'
+
 module Arrest
   class AbstractResource
-    extend ActiveModel::Naming
-
-    attr_accessor :keys
-
     class << self
 
+      attr_accessor :fields
+
       def source
         Arrest::Source::source
       end
 
-
       def body_root response
         all = JSON.parse response
         all["result"]
       end
 
       def build hash
-        raise "override in subclass with a method, that converts the given hash to an object of the desired class"
+        self.new hash
       end
 
       def resource_name
-        self.name.sub(/.*:/,'').downcase.pluralize
+        self.name.sub(/.*:/,'').downcase.plural
+      end
+
+      def has_many(*args)
+        method_name, options = args
+        method_name = method_name.to_sym
+
+        clazz_name = method_name.to_s
+        if options
+          clazz = options[:class_name]
+          if clazz
+            clazz_name = clazz.to_s
+          end
+        end
+        send :define_method, method_name do
+         Arrest::Source.mod.const_get(clazz_name.classify).all_for self
+        end
+      end
+
+      def parent(*args)
+        method_name = args[0].to_s.to_sym
+        send :define_method, method_name do
+          self.parent
+        end
+      end
+
+      def add_attribute attribute_name
+          if @fields == nil
+            @fields = []
+          end
+          @fields << attribute_name
+      end
+
+      def attributes(*args)
+        args.each do |arg|
+          self.send :attr_accessor,arg
+          add_attribute arg
+        end
+      end
+
+      def belongs_to(*args)
+        arg = args[0]
+        name = arg.to_s.downcase
+        attributes "#{name}_id".to_sym
+        send :define_method, name do
+          val = self.instance_variable_get("@#{name}_id")
+          Arrest::Source.mod.const_get(name.classify).find(val)
+        end
+      end
+    end
+
+    attr_accessor :id
+
+    def initialize  as_i
+      as = {}
+      as_i.each_pair do |k,v|
+        as[k.to_sym] = v
+      end
+      unless self.class.fields == nil
+        self.class.fields.each do |field|
+          json_name = field.to_s.classify(false)
+          json_name[0] = json_name[0].downcase
+          self.instance_variable_set("@#{field.to_s}", as[json_name.to_sym]) 
+        end
       end
+      self.id = as[:id]
+    end
+
+    def to_hash
+      result = {}
+      unless self.class.fields == nil
+        self.class.fields.each do |field|
+          json_name = field.to_s.classify(false)
+          result[json_name] = self.instance_variable_get("@#{field.to_s}")
+        end
+      end
+      result[:id] = self.id
+      result
+
     end
 
     def save
-      if self.respond_to?(:id) && self.id.present?
+      if self.respond_to?(:id) && self.id != nil
         AbstractResource::source().put self
       else
         AbstractResource::source().post self
       end
     end
 
-
-    def to_hash
-      raise "override symmetrically to build, to create a hash representation from self"
-    end
-
   end
 end

data/lib/arrest/http_source.rb

@@ -20,13 +20,13 @@ module Arrest
     end
 
     def put rest_resource
-      raise "To change an object it must have an id" unless rest_resource.respond_to?(:id) && rest_resource.id.present?
+      raise "To change an object it must have an id" unless rest_resource.respond_to?(:id) && rest_resource.id != nil
       hash = rest_resource.to_hash
       hash.delete(:id)
       hash.delete("id")
 
       response = self.connection().put do |req|
-        req.url "#{rest_resource.class.path}/#{rest_resource.id}"
+        req.url rest_resource.location
         add_headers req.headers
         req.body = hash.to_json
       end
@@ -35,11 +35,11 @@ module Arrest
 
     def post rest_resource
       raise "new object must have setter for id" unless rest_resource.respond_to?(:id=)
-      raise "new object must not have id" if rest_resource.respond_to?(:id) && rest_resource.id.present?
+      raise "new object must not have id" if rest_resource.respond_to?(:id) && rest_resource.id != nil
       hash = rest_resource.to_hash
       
       response = self.connection().post do |req|
-        req.url rest_resource.class.path
+        req.url rest_resource.class.resource_path
         add_headers req.headers
         req.body = hash.to_json
       end

data/lib/arrest/mem_source.rb

@@ -16,13 +16,13 @@ module Arrest
       "{
         \"queryTime\" : \"0.01866644\",
         \"resultCount\" : #{count},
-        \"results\" : #{content} }"
+        \"result\" : #{content} }"
 
     end
 
     def get sub
       idx = sub.rindex(/\/[0-9]*$/)
-      if idx.present?
+      if idx
         ps = [sub[0..(idx-1)], sub[(idx+1)..sub.length]]
       else
         ps = [sub]
@@ -30,7 +30,7 @@ module Arrest
       val = traverse @@data,ps
       if val.is_a?(Hash)
         wrap collection_json(val.values), val.length
-      elsif val.blank?
+      elsif val == nil
         wrap "{}", 0
       else
         wrap val.to_hash.to_json, 1
@@ -49,7 +49,7 @@ module Arrest
         return hash
       end
       key = keys.first
-      if hash.blank?
+      if hash == nil
         nil
       else
         traverse hash[key.to_s],keys.drop(1)
@@ -59,14 +59,14 @@ module Arrest
 
     def put rest_resource
       @@data[rest_resource.resource_path()][rest_resource.id.to_s] = rest_resource
-      raise "To change an object it must have an id" unless rest_resource.respond_to?(:id) && rest_resource.id.present?
+      raise "To change an object it must have an id" unless rest_resource.respond_to?(:id) && rest_resource.id != nil
       rest_resource
     end
 
     def post rest_resource
       raise "new object must have setter for id" unless rest_resource.respond_to?(:id=)
-      raise "new object must not have id" if rest_resource.respond_to?(:id) && rest_resource.id.present?
-      if @@data[rest_resource.resource_path()].present?
+      raise "new object must not have id" if rest_resource.respond_to?(:id) && rest_resource.id != nil
+      if @@data[rest_resource.resource_path()] != nil
         last_id = @@data[rest_resource.resource_path()].values.map(&:id).sort.last
       else
         last_id = 42
@@ -77,7 +77,7 @@ module Arrest
         next_id = "#{last_id}x"
       end
       rest_resource.id = next_id
-      unless @@data[rest_resource.resource_path()].present?
+      unless @@data[rest_resource.resource_path()] != nil
         @@data[rest_resource.resource_path()] = {}
       end
       @@data[rest_resource.resource_path()][next_id.to_s] = rest_resource

data/lib/arrest/rest_child.rb

@@ -1,7 +1,8 @@
 module Arrest
   class RestChild < AbstractResource
     attr_accessor :parent
-    def initialize parent
+    def initialize parent, h
+      super h
       @parent = parent
     end
 
@@ -11,8 +12,13 @@ module Arrest
         "#{parent.location}/#{self.resource_name}"
       end
 
+      def build parent, hash
+        self.new parent, hash
+      end
+
 
       def all_for parent
+        raise "Parent has no id yet" unless parent.id
         body_root(source().get self.resource_path_for(parent)).map do |h|
           self.build(parent, h)
         end

data/lib/arrest/root_resource.rb

@@ -8,7 +8,9 @@ module Arrest
       end
 
       def all
-        body_root(source().get self.resource_path).map do |h|
+        body = body_root(source().get self.resource_path)
+        body ||= []
+        body.map do |h|
           self.build h
         end
       end

data/lib/arrest/source.rb

@@ -0,0 +1,30 @@
+module Arrest
+
+  class Source 
+    class << self
+      attr_reader :source
+      attr_reader :mod
+
+      def source=(host=nil)
+        if host == nil || host.blank?
+          @source = MemSource.new
+        else
+          @source = HttpSource.new host 
+        end
+        @source
+      end
+
+      def mod=(mod=nil)
+        if mod == nil
+          @mod = Kernel
+        elsif mod.is_a?(Module)
+          @mod = mod
+        else
+          raise "Expected module but got #{mod.class.name}"
+        end
+      end
+
+    end
+  end
+  Source.mod = nil
+end

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/unit.rb

@@ -0,0 +1,127 @@
+require 'arrest'
+require 'test/unit'
+
+class Zoo < Arrest::RootResource
+
+  attributes :name
+
+  has_many :animals
+
+end
+
+class Animal < Arrest::RestChild
+
+  attributes :kind, :age
+
+  parent :zoo
+
+end
+
+class FirstTest < Test::Unit::TestCase
+
+  def setup
+     Arrest::Source.source = nil
+  end
+
+  def test_mem_src
+     Arrest::Source.source = nil
+     src = Arrest::Source.source
+     assert_equal Arrest::MemSource, src.class
+  end
+
+  def test_init
+    zooname =  "Hagenbecks"
+    z = Zoo.new({:name => zooname})
+    assert_equal zooname, z.name
+  end
+  
+  def test_create
+    zoo_count_before = Zoo.all.length
+    new_zoo = Zoo.new({:name => "Foo"})
+    new_zoo.save
+    zoo_count_after = Zoo.all.length
+
+    assert_equal (zoo_count_before + 1), zoo_count_after
+    assert new_zoo.id != nil
+
+    zoo_the_last = Zoo.all.last
+    assert_equal new_zoo.name, zoo_the_last.name
+
+    zoo_reloaded = Zoo.find(new_zoo.id)
+    assert_equal new_zoo.name, zoo_reloaded.name
+  end
+
+  def test_create_and_load
+    zoo_count_before = Zoo.all.length
+    new_zoo = Zoo.new({:name => "Foo"})
+    new_zoo.save
+    zoo_count_after = Zoo.all.length
+
+    assert_equal (zoo_count_before + 1), zoo_count_after
+  end
+
+  def test_update
+    new_zoo = Zoo.new({:name => "Foo"})
+    new_zoo.save
+
+    new_zoo_name = "Hagenbecks"
+    new_zoo.name = new_zoo_name
+    new_zoo.save
+
+    assert new_zoo.id != nil
+
+    zoo_reloaded = Zoo.find(new_zoo.id)
+
+    assert_equal new_zoo_name, zoo_reloaded.name
+  end
+  
+  def test_child
+    new_zoo = Zoo.new({:name => "Foo"})
+    new_zoo.save
+
+    animal_kind = "mouse"
+    new_animal = Animal.new new_zoo, {:kind => animal_kind, :age => 42}
+    assert new_zoo.id != nil
+    assert_equal new_zoo.id, new_animal.zoo.id
+    assert_equal new_zoo.id, new_animal.parent.id
+
+    new_animal.save
+
+    assert new_animal.id != nil
+
+    zoo_reloaded = Zoo.find(new_zoo.id)
+
+
+    assert_equal 1, zoo_reloaded.animals.length
+    assert_equal 42, zoo_reloaded.animals.first.age
+    
+    animal_reloaded = zoo_reloaded.animals.first
+
+    assert_equal new_zoo.id, animal_reloaded.zoo.id
+
+    assert_equal animal_kind, zoo_reloaded.animals.first.kind
+  end
+
+  def test_child_update
+    new_zoo = Zoo.new({:name => "Foo"})
+    new_zoo.save
+
+    animal_kind = "mouse"
+    new_animal = Animal.new new_zoo, {:kind => "foo", :age => 42}
+    new_animal.save
+
+    animal_reloaded = new_zoo.animals.first
+    animal_reloaded.kind = animal_kind
+    animal_reloaded.save
+
+    assert_equal animal_kind, animal_reloaded.kind
+
+    animal_retry = new_zoo.animals.last
+    assert_equal animal_kind, animal_retry.kind
+
+
+
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
-dependencies: []
+date: 2011-11-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &18515300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *18515300
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -29,7 +40,9 @@ files:
 - lib/arrest/mem_source.rb
 - lib/arrest/rest_child.rb
 - lib/arrest/root_resource.rb
+- lib/arrest/source.rb
 - lib/arrest/version.rb
+- test/unit.rb
 homepage: ''
 licenses: []
 post_install_message: