ixtlan-remote 0.1.4 → 0.1.5

data/lib/ixtlan/remote/resource.rb

@@ -31,8 +31,9 @@ module Ixtlan
         @new_method = new_method || @model.method(:new)
       end
 
-      def create_result_objects( result )
-        root = @model.to_s.sub(/.*::/, '').underscore.singularize
+      def create_result_objects( result ) 
+        # naiv singularize english plural
+        root = @model.to_s.sub(/.*::/, '').underscore.sub( /s$/, '')
         if result.is_a? Array
           result.collect do |r|
             new_instance( r[root] || r )
@@ -142,4 +143,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/remote/resource.rb~

@@ -1,3 +1,23 @@
+#
+# ixtlan-remote - helper sync data between miniapps or communicate wth realtime
+# rest-services
+# Copyright (C) 2012 Christian Meier
+#
+# This file is part of ixtlan-remote.
+#
+# ixtlan-remote is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# ixtlan-remote is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with ixtlan-remote.  If not, see <http://www.gnu.org/licenses/>.
+#
 require 'ixtlan/remote/model_helpers'
 module Ixtlan
   module Remote
@@ -5,48 +25,42 @@ module Ixtlan
 
       include ModelHelpers
 
-      def initialize(resource, model_map = {})
+      def initialize(resource, model, new_method = nil)
         @base = resource
-        @map = model_map
+        @model = model
+        @new_method = new_method || @model.method(:new)
       end
 
+      def create_result_objects( result )
+        root = @model.to_s.sub(/.*::/, '').underscore.singularize
+        if result.is_a? Array
+          result.collect do |r|
+            new_instance( r[root] || r )
+          end
+        else
+          attr = if result.is_a?( Hash ) && result.size == 1
+                   result[root]
+                 end
+          new_instance( attr || result )
+        end
+      end
+      private :create_result_objects
+
       def send_it(&block)
         raise "no method given - call any CRUD method first" unless @method
         headers = {:content_type => :json, :accept => :json}
         headers[:params] = @params if @params
+p @resource
         result =
-          if @payload
-            @resource.send @method, @payload.to_json, headers, &block
+          if @method != :get
+            @resource.send( @method, @payload ? @payload.to_json : '', headers, &block )
           else
-            @resource.send @method, headers, &block
-          end
-        unless result.blank?
-          result = JSON.load(result)
-          if @model
-            root = @map[ @model ].singular || @model_key
-            if result.is_a? Array
-              if result.empty?
-                []
-              else
-                root = 
-                  if result[ 1 ].is_a?( Hash ) && result[ 1 ].size == 1
-                    root
-                  end
-                result.collect do |r|
-                  new_instance( @model, r[root] || r )
-                end
-              end
-            else
-              attr = if result.is_a?( Hash ) && result.size == 1
-                       result[root]
-                     else
-                       result
-                     end
-              new_instance(@model, attr)
-            end
-          else
-            result
+            @resource.send( @method, headers, &block )
           end
+        if result && result.size > 0
+          create_result_objects( JSON.load( result ) )
+        else
+          nil
         end
       end
 
@@ -55,10 +69,15 @@ module Ixtlan
         self
       end
 
-      # retrieve(Locale) => GET /locales
-      # retrieve(Locale, 1) => GET /locales/1
-      # retrieve(:locales) => GET /locales
-      # retrieve(:locales, 1) => GET /locales/1
+      def last(args)
+        if args.last.is_a?(Hash)
+          args.reverse!
+          l = args.shift
+          args.reverse!
+          l
+        end
+      end
+
       def retrieve(*args)
         @method = :get
         @params = nil
@@ -67,11 +86,9 @@ module Ixtlan
         self
       end
 
-      # create(locale) => POST /locales
-      # create(:locale => {:code => 'en'}) => POST /locales
       def create(*obj_or_hash)
         @method = :post
-        @payload = nil#obj_or_hash.is_a?(Class)? nil : obj_or_hash
+        @payload = last(obj_or_hash)
         @params = nil
         @resource = @base[path(*obj_or_hash)]
         self
@@ -79,7 +96,7 @@ module Ixtlan
 
       def update(*obj_or_hash)
         @method = :put
-        @payload = nil#obj_or_hash.is_a?(Class)? nil : obj_or_hash
+        @payload = last(obj_or_hash)
         @params = nil
         @resource = @base[path(*obj_or_hash)]
         self
@@ -87,7 +104,7 @@ module Ixtlan
 
       def delete(*obj_or_hash)
         @method = :delete
-        @payload = nil #obj_or_hash.is_a?(Class)? nil : obj_or_hash
+        @payload = last(obj_or_hash)
         @params = nil
         @resource = @base[path(*obj_or_hash)]
         self
@@ -99,54 +116,31 @@ module Ixtlan
 
       private
 
-      def new_instance( clazz, attributes )
-        @map[ clazz ].new( attributes )
+      def new_instance( attributes )
+        @new_method.call( attributes )
       end
 
       def path(*parts)
-        parts.collect { |p| path_part( p ) }.delete_if { |p| p.nil? } * '/'
-      end
-
-      def model_set(model)
-        m = model.singularize.camelize.constantize rescue nil
-        if m
-          @model = m 
-          @model_key = model.singularize.underscore
-        end
+        parts.flatten.collect do |part|
+          case part
+          when Class
+            part.to_s.pluralize.underscore
+          else
+            if part.respond_to? :attributes
+              part.class.to_s.pluralize.underscore
+            else
+              part.to_s
+            end
+          end
+        end * '/'
       end
 
       def path_part(data)
-        model = to_model_underscore(data)
-        case data
-        when Hash
-          @payload = data
-          if model_set(model)
-            model = model.pluralize
-          else
-            model = nil
-          end
-        when Array
-          @payload = data
-          if model_set model
-            model = model.pluralize
-          end
-        when String
-          model_set model
-        when Fixnum
-          model = data.to_s
-        when Symbol
-          model_set model
-        when Class
-          model_set model
-          model = @map.member?( model ) ? @map[ model ].path : model.pluralize
-        else
-          @payload = data
-          model_set model
-          model = model.pluralize
+        unless data.is_a?(Hash)
+          data = [data] unless data.is_a?(Array)
+          data.collect { |d| d.to_s }.join("/")
         end
-        model.underscore if model
       end
-
     end
   end
 end

data/lib/ixtlan/remote/sync.rb

@@ -19,7 +19,6 @@
 # along with ixtlan-remote.  If not, see <http://www.gnu.org/licenses/>.
 #
 require 'ixtlan/remote/summary'
-require 'active_support/all'
 
 module Ixtlan
   module Remote
@@ -43,18 +42,18 @@ module Ixtlan
       # max method ORM dependent
       if defined? ActiveRecord
         def max(clazz)
-          (clazz.maximum(:updated_at) || DateTime.new(0)).to_datetime
+          ( clazz.maximum( :updated_at ) || DateTime.new( 1 ) ).to_datetime
         end
       else
         def max(clazz)
-          clazz.max(:updated_at)
+          clazz.max(:updated_at) || DateTime.new( 1 )
         end
       end
       private :max
 
       # UTC timestamp of last updated record
       def last_update( clazz )
-        last_date = ( max( clazz ) || DateTime.new( 0 ) )
+        last_date = max( clazz )
         last_date.strftime( '%Y-%m-%d %H:%M:%S.' ) + ( "%06d" % ( last_date.sec_fraction / NANOSECONDS_IN_DAY / 1000 ) ) + "+0:00"
       end
       private :last_update
@@ -101,4 +100,4 @@ module Ixtlan
       alias :to_s :to_log
     end
   end
-end
+end

data/lib/ixtlan/user_management/session_manager.rb

@@ -1,5 +1,4 @@
 # -*- Coding: utf-8 -*-
-require 'ixtlan/user_management/user_model'
 require 'ixtlan/user_management/user_serializer'
 require 'ixtlan/user_management/session_model'
 require 'ixtlan/user_management/session_serializer'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ixtlan-remote
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Christian Meier
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-01 00:00:00 Z
+date: 2013-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client