motion_model_resource 0.1.9 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTc1MTZkYTZhM2QyYjFkMjViN2VjNDNlNDhmMmUxNzhlZjdhZjMyZQ==
+    MmNkMDQxZTUwYTNmNzBhZmU2ZTE3OGNkNzFhMzlmZTUwNTY5ZjBmNQ==
   data.tar.gz: !binary |-
-    ZDEyNzY4ZjVmZTc0ODQ4MzY4Y2EzNmM4YWM0ZDMyZDYyMDc3NGE5Yg==
+    MzQ3MmVmMjU0OTBmOGNkYTA2YmQ3MmE2YjMwODY4YzFiMjBmNDFhYg==
 SHA512:
   metadata.gz: !binary |-
-    MzhiMjcxNjEwMjZkYjZiYjIxMTRiM2FjNTc0ZmNhYTAzODBmZDc0NjZlOTMx
-    ZWM2MDY4ZTcyYTIzODM4MzMzYWY3YzYzM2NlMGQ0YTUwZDAzYWY2NmM5MjIz
-    ZDdhNWE3ODcwMTk2MDdmOTcxYTBiNjdiZjY3NjJmMThhM2U3NjI=
+    NzAxYTRmOWZmODlmZTgyOTY5MzE2MmNhM2VhMDllMjU0OTU5N2U2MWUyYzY0
+    NTUzYTgxNzU0YWQzMjQwYmNjOWI2MDU5OTk5MzI2MWNhMDVkNDZjZGNhMTI5
+    YTkyMjcxZWY5ODMyNTYxY2UzZmFhYTk0OGEwMTQ4ZjhmMDY2NWI=
   data.tar.gz: !binary |-
-    ZDg5ZTg0N2IzZDA4NzA2NGM4Y2M3MTNhMzdkNDJkNmEyZWY0NzdlZmQxNmFh
-    YjE2MjE1MGZlNzYxMjZiYzg5MDYyNjNmNDkzMzUwNDBlY2JlZDhjNzRiNDJk
-    MzMyZWI1ZTY2YmFlNzYzMjBmYmRjYjNlYjY1MjcxZTQ4ODY5YTg=
+    ZDYxOWNlOTNmNGQzMzM3MTRjZWE4NjBjZDVjZjJkZjEyOWRlMjNmMWJiYzU5
+    ODBhZTlmMGJmY2E5NjdkZTBhZjNjNjg4MzUwNTkzMmVhZDhiYWVhNTJjZDk4
+    ZDZjZmJhZmI1MWEyYTcxYmY3ODMxMTRmYWExYzE3MTU1MDkyNTc=

data/app/app_delegate.rb

@@ -1,2 +1,27 @@
 class FakeDelegate
 end
+
+class Task
+  include MotionModel::Model
+  include MotionModel::ArrayModelAdapter
+  include MotionModelResource::ApiWrapper
+
+  def self.url
+    "http://example.com/tasks"
+  end
+
+  def self.wrapper
+    @wrapper ||= {
+      fields: {
+        id:       :id,
+        user_id:  :user_id,
+        name:     :name,
+      },
+      relations: [:user]
+    }
+  end
+
+  columns name:       :string,
+          updated_at: :date
+  belongs_to :user
+end

data/{motion/resource/data_parser.rb → lib/motion-model-resource/date_parser.rb}

@@ -1,14 +1,18 @@
 module MotionModelResource
   module DateParser
-    def self.parseDate(arg)
+    def self.parse_date(arg)
+      return nil if arg.blank?
       additional_parsestring = arg.include?(".") ? ".SSS" : ""
-      date_formatter = NSDateFormatter.alloc.init
       date_formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss#{additional_parsestring}ZZZZ"
       date = date_formatter.dateFromString arg
 
       return nil if date.blank?
 
-      date.description
+      "#{date.description}"
+    end
+    
+    def self.date_formatter
+      @date_formatter ||= NSDateFormatter.new
     end
   end
 end

data/{motion → lib/motion-model-resource}/version.rb

@@ -1,3 +1,3 @@
 module MotionModelResource
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/lib/motion-model-resource/wrapper.rb

@@ -0,0 +1,312 @@
+module MotionModelResource
+  class WrapperNotDefinedError < Exception; end
+  class URLNotDefinedError < Exception; end
+  class ActionNotImplemented < Exception; end
+
+  module ApiWrapper
+    def self.included(base)
+      base.extend(PublicClassMethods)
+    end
+
+    module PublicClassMethods
+      # Returns the last updated at or nil value of Model
+      def last_update
+        return unless columns.include? :updated_at
+        order{|one, two| two.updated_at <=> one.updated_at}.first.try(:updated_at)
+      end
+
+      def lastUpdate
+        NSLog "[DEPRECATED - lastUpdate] please use last_update instead."
+        last_update
+      end
+
+      # Loads the given URL and parse the JSON for new models.
+      # If the models are present, the model will update.
+      # If block given, the block will called, when the the models are saved. The model/s will be passed as an argument to the block.
+      def fetch(site = nil, params = {}, &block)
+        raise MotionModelResource::WrapperNotDefinedError.new "Wrapper is not defined!" unless self.respond_to?(:wrapper)
+        raise MotionModelResource::URLNotDefinedError.new "Resource URL ist not defined! (#{name}.url)" if site.blank? && self.try(:url).blank?
+
+        site = self.url if site.blank?
+
+        BW::HTTP.get(site, params) do |response|
+          models = []
+          if response.ok? && response.body.present?
+            begin
+              json = BW::JSON.parse(response.body.to_str)
+              models = update_models(json)
+            rescue BW::JSON::ParserError
+            end
+          end
+
+          block.call(models) if block.present? && block.respond_to?(:call)
+        end
+      end
+
+      # Parses given JSON object and saves the founded models.
+      # Returns an array with models, or the founded model
+      def update_models(json)
+        if json.is_a?(Array)
+          model_ids = []
+          for json_part in json
+            model = save_model_with(json_part)
+            model_ids << "#{model.id}".to_i if model.present?
+          end
+          where(:id).in model_ids
+        else
+          model = save_model_with(json)
+          return nil if model.blank?
+
+          find("#{model.id}".to_i)
+        end
+      end
+
+      def updateModels(json)
+        NSLog "[DEPRECATED - updateModels] please use update_models instead."
+        update_models json
+      end
+
+      # Builds a model for given JSON object. Returns a new or presend model.
+      def build_model_with(json)
+        return nil if json.is_a?(Array)
+
+        model = where("id").eq(json["id"]).first || self.new        
+        model.wrap(json)
+      end
+
+      def buildModel(json)
+        NSLog "[DEPRECATED - buildModel] please use build_model_with instead."
+        build_model_with json
+      end
+
+      # Builds and update/create a model for given JSON object. Returns a new or presend model.
+      def save_model_with(json)
+        return nil if json.is_a?(Array)
+
+        model = build_model_with(json)
+        model.try :save
+        model
+      end
+    end
+
+    # Instance methods
+
+    # When called, the lastSyncAt Column will be set with Time.now (if present)
+    def touch_sync
+      self.lastSyncAt = Time.now if self.respond_to?(:lastSyncAt=)
+    end
+
+    # Saves the current model. Calls super when block is not given.
+    # If block is given, the url method will be needed to call the remote server.
+    # The answer of the server will be parsed and stored.
+    # If the record is a new one, a POST request will be fired, otherwise a PUT call comes to the server.
+    def save(options = {}, &block)
+      if block.present?
+        save_remote(options, &block)
+      else
+        super
+      end
+    end
+    
+    def save_remote(options, &block)
+      raise MotionModelResource::URLNotDefinedError.new "URL is not defined for #{self.class.name}!" unless self.class.respond_to?(:url)
+
+      self.id = nil if self.id.present? && save_action == :create
+
+      params = build_hash_from_model(self.class.name.underscore, self)
+      params.merge!(options[:params]) if options[:params].present?
+
+      model = self
+
+      save_remote_call(params) do |response|
+        if response.ok? && response.body.present?
+          begin
+            json = BW::JSON.parse(response.body.to_str)
+
+            model.wrap json
+            model.save
+            model.touch_sync
+          rescue BW::JSON::ParserError
+            model = nil
+          end
+        else
+          model = nil
+        end
+
+        block.call(model, json) if block.present? && block.respond_to?(:call)
+      end
+    end
+
+    def destroy(options = {}, &block)
+      if block.present?
+        destroy_remote(options, &block)
+      else
+        super
+      end
+    end
+    
+    # Destroys a remote model
+    # UNTESTED # TODO write a test
+    def destroy_remote(options = {}, &block)
+      raise MotionModelResource::URLNotDefinedError.new "URL is not defined for #{self.class.name}!" unless self.class.respond_to?(:url)
+      
+      model = self
+
+      BW::HTTP.delete(save_url, {payload: options[:params]}) do |response|
+        if response.ok? || options[:force] == true
+          model.delete
+        end
+
+        block.call if block.present? && block.respond_to?(:call)
+      end
+    end
+    
+    # Takes no care of the server response.
+    # UNTESTED # TODO write a test
+    def destroy!(options = {}, &block)
+      options.merge!(force: true)
+
+      destroy_remote(options, &block)
+    end
+    alias_method :destroy_remote!, :destroy!
+
+    # Returns a hash with given model
+    def build_hash_from_model(main_key, model)
+      hash = {
+        main_key => {}
+      }
+      hash[main_key] = {}
+
+      model.attributes.each do |key, attribute|
+        if model.class.has_many_columns.keys.include?(key)
+          new_key = attribute.first.class.name.pluralize.underscore
+          hash[main_key][new_key] = []
+          for a in attribute
+            hash[main_key][new_key].push(build_hash_from_model(new_key, a)[new_key])
+          end
+        elsif attribute.respond_to?(:attributes)
+          new_key = attribute.class.name.underscore
+          h = attribute.build_hash_from_model(new_key, attribute)
+          hash[main_key][new_key] = h[new_key] if h.has_key?(new_key)
+        else
+          model.class.wrapper[:fields].each do |wrapper_key, wrapper_value|
+            hash[main_key][wrapper_key] = attribute if wrapper_value == key
+          end
+        end
+      end
+
+      hash
+    end
+
+    def buildHashFromModel(mainKey, model)
+      NSLog "[DEPRECATED - buildHashFromModel] please use build_hash_from_model instead."
+      build_hash_from_model mainKey, model
+    end
+
+    # Loads the given URL and parse the JSON for a model.
+    # If the model is present, the model will updates.
+    # If block given, the block will called, when the the model is saved. The model will be passed as an argument to the block.
+    def fetch(site = nil, params = {}, &block)
+      raise MotionModelResource::URLNotDefinedError.new "Resource URL ist not defined! (#{self.class.name}.url)" if site.blank? && self.class.try(:url).blank?
+      raise MotionModelResource::WrapperNotDefinedError.new "Wrapper is not defined!" unless self.class.respond_to?(:wrapper)
+
+      site = "#{self.class.url}/#{id}" if site.blank?
+
+      model = self
+      BW::HTTP.get(site, params) do |response|
+        if response.ok? && response.body.present?
+          begin
+            json = BW::JSON.parse(response.body.to_str)
+            model.wrap(json)
+
+            model.save
+          rescue BW::JSON::ParserError
+            model = nil
+          end
+        else
+          model = nil
+        end
+
+        block.call model if block.present? && block.respond_to?(:call)
+      end
+    end
+
+    # Wraps the current model with the given JSON.
+    # All the fields found in JSON and self.wrapper will be parsed.
+    # Returns true, when no error exists
+    def wrap(model_json)
+      return unless self.class.respond_to?(:wrapper)
+
+      touch_sync
+
+      self.class.wrapper[:fields].each do |online, local|
+        if model_json.respond_to?("key?") && model_json.key?("#{online}")
+          value = parse_value(local, model_json["#{online}"])
+          self.send("#{local}=", value)
+        end
+      end
+
+      if self.class.wrapper[:relations].present?
+        self.class.wrapper[:relations].each do |relation|
+          if model_json.respond_to?("key?") && model_json.key?("#{relation}") && model_json["#{relation}"].present?
+            klass_name = column(relation.to_s).instance_variable_get("@options").try(:[], :joined_class_name) || relation.to_s.singularize.camelize
+
+            klass = Object.const_get(klass_name)
+
+            new_relation = klass.update_models(model_json["#{relation}"])
+            self.send("#{relation}=", new_relation) rescue NoMethodError # not correct implemented in MotionModel
+          end
+        end
+      end
+
+      self
+    end
+
+    # Parses given value for key in the right format for MotionModel.
+    # Currently only Date/Time support needed
+    def parse_value(key, value)
+      case self.column_type(key.to_sym)
+      when :date, :time then MotionModelResource::DateParser.parse_date value
+      else value
+      end
+    end
+
+    def parseValue(key, value)
+      NSLog "[DEPRECATED - parseValue] please use parse_value instead."
+      parse_value
+    end
+
+    private
+
+    # Returns the action for save
+    def save_action
+      if new_record?
+        :create
+      elsif self.id.present?
+        :update
+      else
+        raise MotionModelResource::ActionNotImplemented.new "Action ist not implemented for #{self.class.name}!"
+      end
+    end
+
+    # Returns the URL for the resource
+    def save_url
+      raise MotionModelResource::URLNotDefinedError.new "URL is not defined for #{self.class.name}!" unless self.class.respond_to?(:url)
+
+      case save_action
+      when :create then self.try(:url) || self.class.url
+      when :update then self.try(:url) || "#{self.class.url}/#{id}"
+      end
+    end
+
+    # Calls a request to the remote server with the given params.
+    def save_remote_call(params, &request_block)
+      case save_action
+      when :create
+        BW::HTTP.post(save_url, {payload: params}, &request_block)
+      when :update
+        BW::HTTP.put(save_url, {payload: params}, &request_block)
+      end
+    end
+  end
+end

data/lib/motion_model_resource.rb

@@ -1,5 +1,9 @@
+unless defined?(Motion::Project::Config)
+  raise "This file must be required within a RubyMotion project Rakefile."
+end
+
 Motion::Project::App.setup do |app|
-  Dir.glob(File.join(File.expand_path('../../motion/**/*.rb', __FILE__))).each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'motion-model-resource/*.rb')).each do |file|
     app.files.unshift(file)
   end
 end

data/motion_model_resource.gemspec

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../motion/version', __FILE__)
+require File.expand_path('../lib/motion-model-resource/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Torben Toepper"]
-  gem.email         = ["lshadyl@googlemail.com"]
-  gem.description   = "Simple JSON API Wrapper for MotionModel on RubyMotion"
-  gem.summary       = "Simple JSON API Wrapper for MotionModel on RubyMotion"
+  gem.email         = ["message@torbentoepper.de"]
+  gem.description   = "Simple REST JSON API Wrapper for MotionModel on RubyMotion"
+  gem.summary       = "Simple REST JSON API Wrapper for MotionModel on RubyMotion"
   gem.homepage      = "https://github.com/torben/motion-resource"
 
   gem.files         = `git ls-files`.split($\)

data/spec/date_parser_spec.rb

@@ -0,0 +1,17 @@
+describe '#date_parser' do
+  describe '#parseValue' do
+    it 'should parse a date in the right format for MotionModel' do
+      time_string = "2013-11-03T16:59:35+01:00"
+
+      MotionModelResource::DateParser.parse_date(time_string).should.equal("2013-11-03 15:59:35 +0000")
+    end
+
+    it 'should return nil, when giving a wrong time' do
+      time_string = "2342"
+      time_string2 = "2013-21-03T16:59:35+01:00"
+
+      MotionModelResource::DateParser.parse_date(time_string).should.equal nil
+      MotionModelResource::DateParser.parse_date(time_string2).should.equal nil
+    end
+  end
+end

data/spec/wrapper_spec.rb

@@ -31,11 +31,12 @@ class User
     }
   end
 
-  columns name:     :string,
-          plan_id:  :plan_id,
-          email:    :string,
-          age:      :integer,
-          admin:    :boolean
+  columns name:       :string,
+          plan_id:    :plan_id,
+          email:      :string,
+          age:        :integer,
+          admin:      :boolean,
+          lastSyncAt: :time
 
   has_many :tasks
   belongs_to :plan
@@ -61,7 +62,9 @@ class Task
     }
   end
 
-  columns name: :string
+  columns name:       :string,
+          due_date:   :time,
+          updated_at: :date
   belongs_to :user
 end
 
@@ -88,6 +91,24 @@ class Plan
   has_many :users
 end
 
+class PlanWithoutUrl
+  include MotionModel::Model
+  include MotionModel::ArrayModelAdapter
+  include MotionModelResource::ApiWrapper
+
+  def self.wrapper
+    @wrapper ||= {
+      fields: {
+        id:       :id,
+        name:     :name,
+      },
+      relations: [:users]
+    }
+  end
+
+  columns name: :string
+end
+
 describe "Fetching a model" do
   extend WebStub::SpecHelpers
 
@@ -118,6 +139,7 @@ describe "Fetching a model" do
       user.email.should.equal("peter@pan.de")
       user.age.should.equal(14)
       user.admin.should.equal(false)
+      user.lastSyncAt.should.not == nil
     end
   end
 
@@ -168,19 +190,238 @@ describe "Fetching a model" do
     end
   end
 
-  describe '#parseValue' do
-    it 'should parse a date in the right format for MotionModel' do
-      time_string = "2013-11-03T16:59:35+01:00"
+  describe 'Class Methods' do
+    describe '#build_model_with' do
+      it 'should build a new Task object' do
+        json = {
+          "id" => 929,
+          "name" => 'Cleaning up the closet',
+          "user_id" => 10
+        }
+
+        t = Task.build_model_with(json)
+
+        t.name.should == "Cleaning up the closet"
+        t.user_id.should == 10
+        t.class == Task
+        t.new_record?.should == true
+
+        t.save
+      end
+
+      it 'should return and update an existing model' do
+        json = {
+          "id" => 929,
+          "name" => 'A new name',
+          "user_id" => 10
+        }
+
+        t = Task.build_model_with(json)
+
+        t.name.should == "A new name"
+        t.user_id.should == 10
+        t.class == Task
+        t.new_record?.should == false
+      end
+
+      it 'should retun nil, if array is given' do
+        json = [{
+          id: 923,
+          name: 'Cleaning up the closet',
+          user_id: 10
+        },
+        {
+          id: 924,
+          name: 'Cleaning up the closet2',
+          user_id: 11
+        }]
+
+        Task.build_model_with(json).should == nil
+      end
+    end
+
+    describe '#create_model_with' do
+      it 'should create a new Task object' do
+        json = {
+          "id" => 828,
+          "name" => 'An Amazing Name!',
+          "user_id" => 12
+        }
+
+        t = Task.save_model_with(json)
+
+        t.name.should == "An Amazing Name!"
+        t.user_id.should == 12
+        t.class == Task
+        t.new_record?.should == false
+      end
+
+      it 'should return and update an existing model' do
+        json = {
+          "id" => 828,
+          "name" => 'A newer name',
+          "user_id" => 12
+        }
+
+        t = Task.save_model_with(json)
+        t.new_record?.should == false
+
+        t2 = Task.find(828)
+        t2.name.should == "A newer name"
+        t2.user_id.should == 12
+        t2.class == Task
+      end
+
+      it 'should retun nil, if array is given' do
+        json = [{
+          id: 923,
+          name: 'Cleaning up the closet',
+          user_id: 10
+        },
+        {
+          id: 924,
+          name: 'Cleaning up the closet2',
+          user_id: 11
+        }]
+
+        Task.build_model_with(json).should == nil
+      end
+    end
+
+    describe '#update_models' do
+      before do
+        3.times { User.create }
+        Task.create(id: 22)
+        Task.create(id: 33)
+      end
+
+      it 'should return nil, if model has no updated_at column' do
+        User.last_update.should == nil
+      end
+
+      it 'should return last updated_at, if model has updated_at column' do
+        Task.last_update.to_s.should.equal Task.find(33).updated_at.to_s
+      end
+    end
+
+    describe '#touch_sync' do
+      it 'should sets a timestap when calling' do
+        u = User.new
+        u.touch_sync
+        u.lastSyncAt.class.should == Time
+      end
+
+      it 'should return nil if model has no lastSyncAt column' do
+        t = Task.new
+        t.touch_sync.should == nil
+      end
+    end
+  end
+
+  describe 'Instance Methods' do
+    describe '#parse_value' do
+      it 'should parse a date string to a time string' do
+        t = Task.new
+        t.parse_value(:due_date, "2014-05-29T10:59:39+02:00").should == "2014-05-29 08:59:39 +0000"
+      end
+
+      it 'should return nil if the input date is invalid' do
+        t = Task.new
+        t.parse_value(:due_date, "2014-05-29 10:59:39").should == nil
+      end
+    end
+
+    describe '#save' do
+      it 'should return nil, if the remote server returns empty json' do
+        stub_request(:post, Task.url).to_return(json: {})
+        t = Task.new
+        t.name = "This is Sparta!"
+
+        new_model = nil
+        t.save do |model|
+          resume
+          new_model = model
+        end
+
+        wait_max 1.0 do
+          new_model.should == nil
+        end
+      end
+
+      it 'should save a model and call the remote server' do
+        stub_request(:post, Task.url).to_return(json: {id: 88, name: 'This is Sparta!'})
+        t = Task.new
+        t.name = "This is Sparta!"
 
-      MotionModelResource::DateParser.parseDate(time_string).should.equal("2013-11-03 15:59:35 +0000")
+        @new_model = nil
+        t.save do |model|
+          @new_model = model
+          resume
+        end
+
+        wait_max 1.0 do
+          @new_model.should.not == nil
+          @new_model.new_record?.should == false
+          @new_model.name.should == "This is Sparta!"
+        end
+      end
+
+      it 'should update a model and call the remote server' do
+        t = Task.last
+        t.name = "This was Sparta :("
+        stub_request(:put, "#{Task.url}/#{t.id}").to_return(json: {name: 'This was Sparta :('})
+
+        @update_model = nil
+        t.save do |model|
+          @update_model = model
+          resume
+        end
+
+        wait_max 1.0 do
+          @update_model.should.not == nil
+          @update_model.new_record?.should == false
+          @update_model.name.should == "This was Sparta :("
+        end
+      end
     end
 
-    it 'should return nil, when giving a wrong time' do
-      time_string = "2342"
-      time_string2 = "2013-21-03T16:59:35+01:00"
+    describe '#save_action' do
+      it 'should return :create, when having a new record' do
+        t = Task.new
+        t.send(:save_action).should == :create
+      end
+
+      it 'should return :update, when having a new record' do
+        t = Task.last
+        t.send(:save_action).should == :update
+      end
+
+      it 'should raise an exception, when having a new record with an id' do
+        t = Task.last
+        t.id = nil
+        lambda {
+          t.send(:save_action)
+        }.should.raise(MotionModelResource::ActionNotImplemented)
+      end
+    end
+
+    describe '#save_url' do
+      it 'should raise an exception, when url property is missing' do
+        p = PlanWithoutUrl.new
+        lambda {
+          p.send(:save_url)
+        }.should.raise(MotionModelResource::URLNotDefinedError)
+      end
+
+      it 'should return the right create url' do
+        t = Task.new
+        t.send(:save_url).should == Task.url
+      end
 
-      MotionModelResource::DateParser.parseDate(time_string).should.equal nil
-      MotionModelResource::DateParser.parseDate(time_string2).should.equal nil
+      it 'should return the right update url' do
+        t = Task.first
+        t.send(:save_url).should == "#{Task.url}/#{t.id}"
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_model_resource
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Torben Toepper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -66,9 +66,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
-description: Simple JSON API Wrapper for MotionModel on RubyMotion
+description: Simple REST JSON API Wrapper for MotionModel on RubyMotion
 email:
-- lshadyl@googlemail.com
+- message@torbentoepper.de
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -81,11 +81,12 @@ files:
 - README.md
 - Rakefile
 - app/app_delegate.rb
+- lib/motion-model-resource/date_parser.rb
+- lib/motion-model-resource/version.rb
+- lib/motion-model-resource/wrapper.rb
 - lib/motion_model_resource.rb
-- motion/resource/data_parser.rb
-- motion/resource/wrapper.rb
-- motion/version.rb
 - motion_model_resource.gemspec
+- spec/date_parser_spec.rb
 - spec/wrapper_spec.rb
 homepage: https://github.com/torben/motion-resource
 licenses:
@@ -110,6 +111,7 @@ rubyforge_project:
 rubygems_version: 2.1.11
 signing_key: 
 specification_version: 3
-summary: Simple JSON API Wrapper for MotionModel on RubyMotion
+summary: Simple REST JSON API Wrapper for MotionModel on RubyMotion
 test_files:
+- spec/date_parser_spec.rb
 - spec/wrapper_spec.rb

data/motion/resource/wrapper.rb

@@ -1,237 +0,0 @@
-module MotionModelResource
-  class WrapperNotDefinedError < Exception; end
-  class URLNotDefinedError < Exception; end
-  class ActionNotImplemented < Exception; end
-
-  module ApiWrapper
-    def self.included(base)
-      base.extend(PublicClassMethods)
-    end
-
-    module PublicClassMethods
-      # Returns the last updated at or nil value of Model
-      def lastUpdate
-        order(:updated_at).first.try(:updated_at)
-      end
-
-      # Loads the given URL and parse the JSON for new models.
-      # If the models are present, the model will update.
-      # If block given, the block will called, when the the models are saved. The model/s will be passed as an argument to the block.
-      def fetch(site, params = {}, &block)
-        raise MotionModelResource::WrapperNotDefinedError.new "Wrapper is not defined!" unless self.respond_to?(:wrapper)
-        BW::HTTP.get(site, params) do |response|
-          models = []
-          if response.ok? && response.body.present?
-            json = BW::JSON.parse(response.body.to_str)
-            models = updateModels(json)
-          end
-
-          block.call(models) if block.present? && block.respond_to?(:call)
-        end
-      end
-
-      # Parses given JSON object and saves the founded models.
-      # Returns an array with models, or the founded model
-      def updateModels(json)
-        if json.is_a?(Array)
-          models = []
-          for jsonPart in json
-            model = buildModel(jsonPart)
-            if model.present?
-              model.save
-              models << model
-            end
-          end
-          return models
-        else
-          model = buildModel(json)
-          if model.present?
-            model.save
-            return model
-          end
-        end
-      end
-
-      # Builds a model for given JSON object. Returns a new or presend model.
-      def buildModel(json)
-        classname = name.underscore
-
-        model = where("id").eq(json["id"]).first
-        if model.present?
-          if model.wrap(json)
-            model.lastSyncAt = Time.now if model.respond_to?(:lastSyncAt)
-            return model
-          end
-        else
-          newModel = self.new
-          return newModel if newModel.wrap(json)
-        end
-
-        return nil
-      end
-    end
-
-    # Instance methods
-
-    # Saves the current model. Calls super when block is not given.
-    # If block is given, the url method will be needed to call the remote server.
-    # The answer of the server will be parsed and stored.
-    # If the record is a new one, a POST request will be fired, otherwise a PUT call comes to the server.
-    def save(options = {}, &block)
-      if block.present?
-        raise MotionModelResource::URLNotDefinedError.new "URL is not defined for #{self.class.name}!" unless self.class.respond_to?(:url)
-
-        action = if new_record?
-          "create"
-        elsif self.id.present?
-          "update"
-        else
-          raise MotionModelResource::ActionNotImplemented.new "Action ist not implemented for #{self.class.name}!"
-        end
-
-        model = self
-
-        model.id = nil if model.id.present? && action == "create"
-
-        hash = buildHashFromModel(self.class.name.underscore, self)
-        hash.merge!(options[:params]) if options[:params].present?
-
-        requestBlock = Proc.new do |response|
-          if response.ok? && response.body.present?
-            json = BW::JSON.parse(response.body.to_str)
-
-            model.wrap(json)
-            model.lastSyncAt = Time.now if model.respond_to?(:lastSyncAt)
-            model.save
-          else
-            model = nil
-          end
-
-          block.call(model) if block.present? && block.respond_to?(:call)
-        end
-
-        case action
-        when "create"
-          BW::HTTP.post(self.try(:url) || self.class.url, {payload: hash}, &requestBlock)
-        when "update"
-          BW::HTTP.put("#{self.try(:url)}" || "#{self.class.url}/#{model.id}", {payload: hash}, &requestBlock)
-        end
-      else
-        super
-      end
-    end
-    alias_method :save_remote, :save
-    
-    # Destroys a remote model
-    # UNTESTED # TODO write a test
-    def destroy(options = {}, &block)
-      if block.present?
-        raise MotionModelResource::URLNotDefinedError.new "URL is not defined for #{self.class.name}!" unless self.class.respond_to?(:url)
-        
-        model = self
-
-        BW::HTTP.delete("#{self.try(:url)}" || "#{self.class.url}/#{model.id}", {payload: options[:params]}) do |response|
-          if response.ok? || options[:force] == true
-            model.delete
-          end
-
-          block.call if block.present? && block.respond_to?(:call)
-        end
-      else
-        super
-      end
-    end
-    alias_method :destroy_remote, :destroy
-    
-    # Takes no care of the server response.
-    # UNTESTED # TODO write a test
-    def destroy!(options = {}, &block)
-      options.merge!(force: true)
-
-      destroy(options, &block)
-    end
-    alias_method :destroy_remote!, :destroy!
-
-    # Returns a hash with given model
-    def buildHashFromModel(mainKey, model)
-      hash = {
-        mainKey => {}
-      }
-      hash[mainKey] = {}
-
-      model.attributes.each do |key, attribute|
-        if model.class.has_many_columns.keys.include?(key)
-          newKey = attribute.first.class.name.pluralize.downcase
-          hash[mainKey][newKey] = []
-          for a in attribute
-            hash[mainKey][newKey].push(buildHashFromModel(newKey, a)[newKey])
-          end
-        elsif attribute.respond_to?(:attributes)
-          newKey = attribute.class.name.underscore
-          h = buildHashFromModel(newKey, attribute)
-          hash[mainKey][newKey] = h[newKey] if h.has_key?(newKey)
-        else
-          model.class.wrapper[:fields].each do |wrapperKey, wrapperValue|
-            hash[mainKey][wrapperKey] = attribute if wrapperValue == key
-          end
-        end
-      end
-
-      return hash
-    end
-
-    # Loads the given URL and parse the JSON for a model.
-    # If the model is present, the model will updates.
-    # If block given, the block will called, when the the model is saved. The model will be passed as an argument to the block.
-    def fetch(site, params = {}, &block)
-      raise MotionModelResource::WrapperNotDefinedError.new "Wrapper is not defined!" unless self.class.respond_to?(:wrapper)
-      model = self
-      BW::HTTP.get(site, params) do |response|
-        if response.ok? && response.body.present?
-          json = BW::JSON.parse(response.body.to_str)
-          model.wrap(json)
-          model.lastSyncAt = Time.now if model.respond_to?(:lastSyncAt)
-
-          model.save
-        end
-
-        block.call if block.present? && block.respond_to?(:call)
-      end
-    end
-
-    # Wraps the current model with the given JSON.
-    # All the fields found in JSON and self.wrapper will be parsed.
-    # Returns true, when no error exists
-    def wrap(modelJson)
-      return unless self.class.respond_to?(:wrapper)
-
-      self.class.wrapper[:fields].each do |online, local|
-        if modelJson.respond_to?("key?") && modelJson.key?("#{online}")
-          value = parseValue(local, modelJson[online])
-          self.send("#{local}=", value)
-        end
-      end
-
-      if self.class.wrapper[:relations].present?
-        self.class.wrapper[:relations].each do |relation|
-          if modelJson.respond_to?("key?") && modelJson.key?("#{relation}") && modelJson["#{relation}"].present?
-            klass = Object.const_get(relation.to_s.singularize.camelize)
-            newRelation = klass.updateModels(modelJson["#{relation}"])
-            self.send("#{relation}=", newRelation) rescue NoMethodError # not correct implemented in MotionModel
-          end
-        end
-      end
-
-      true
-    end
-
-    # Parses given value for key in the right format for MotionModel.
-    # Currently only Date/Time support needed
-    def parseValue(key, value)
-      case self.column_type(key.to_sym)
-      when :time then MotionModelResource::DateParser.parseDate value
-      else value
-      end
-    end
-  end
-end