cyrax 0.6.0.beta → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzJlYTg3MDkzYjVjMzJhODVmODAwNTllMzVlM2Q2Y2Q4MDQ2NjUyNQ==
+    Yjc1NmExZWEyMjNhOWJhNzQ0Nzc2ZjU2Njg2NTE4YjYwNWFhNTI0Nw==
   data.tar.gz: !binary |-
-    ODdlMjE1MGIxMzRkZTc1MmExMTFkZWUyYThlZGViM2RiNjEwYjZmZQ==
+    ODA0NjA2MGE1NjFkYjZkNzMzZGI4OTFjNzRiMDQ0NzFlYTM0MTRkNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzE2M2IzNjRmZTAzOGY2MjNlMmJhYzg0NzM2YjFhYjFhZTljNTZlYTMyMTE5
-    YjE0OGQ2ZjE3Y2IzYWIxMTg2MTA2MjFmMzdlYjhhNGFkN2IxOGQ1YzFlNWVi
-    YmY1ODAyM2FkNjdlODcxYTNmYjk3NjcyOGRhYWQxYjdlYjZlMjc=
+    ZTEyMzA0M2Y2NGJlMzIwOWM0NDZiMTYxNmU2MTg5OGE3OGUxMzc2OWVlMTZl
+    N2FlMTM0ZGRiYjVjYmRlY2NmNjM5ZGRmZDJlZjEzMjdhYjhlMTkzZTc1ZGEw
+    MGNhMmQyMzE5ZGZjMjIxNzM2MzE2NWZhOTkyMmFlNjNlYTBiN2Y=
   data.tar.gz: !binary |-
-    NWM1NzBjNDEwM2E2NDc4ZGEyNmZhNGY3MTRiN2YyNThmYzQ3NzU1OWY5Mjg3
-    NzE2ZTEyZWEyMDAyNWU3NDE4MzRhYjNkOTI2NDRiMDFjZTQxNjBkMjU4NmQy
-    ZjA4ZWMzZmUwMjQ4MjJiNzgxYTY2NmZkNDYzMjhjNThkODcyNjQ=
+    Y2NkMmNjMWNlOGQ2N2QzYjdhOWMwZmU2NmUyOWZhZjJhM2ZkM2RkZjk1OWE2
+    MTVjOGY5YjBmMWYzZTcwMTZlNGMxZWFhODQ4ZTYyMDlhOGUxMWViN2ZlOGIz
+    NzExNzMzMjU2OWI3OTYyMDc2NTk0YjgzNmQ1YjdkNWVkYWUzZTI=

data/lib/cyrax/extensions/has_repository.rb

@@ -33,9 +33,14 @@ module Cyrax::Extensions
           self._repository_class = klass
         end
         if block_given?
+          # temporary workaround. we should not use one object hash for parent and childrens
+          if self._repository_options.present?
+            self._repository_options = self._repository_options.dup
+          end
+
           self._repository_options ||= {}
-          self._repository_options[:finder_blocks] = {}
-          self._repository_options[:finder_blocks][finder_name || :scope] = block
+          self._repository_options[:finders] = {}
+          self._repository_options[:finders][finder_name || :scope] = block
         end
       end
     end

data/lib/cyrax/extensions/has_service.rb

@@ -107,18 +107,23 @@ module Cyrax::Extensions
 
     # DEPRECATED METHODS
     def resource_scope
+      ActiveSupport::Deprecation.warn "#resource_scope inside Resource deprecated. Use repository.scope instead."
       respository.scope
     end
     def build_collection
+      ActiveSupport::Deprecation.warn "#build_collection inside Resource deprecated. Use repository.find_all instead."
       respository.find_all
     end
     def find_resource(id)
+      ActiveSupport::Deprecation.warn "#find_resource inside Resource deprecated. Use repository.find instead."
       respository.find(id)
     end
     def save_resource(resource)
+      ActiveSupport::Deprecation.warn "#save_resource inside Resource deprecated. Use repository.save instead."
       respository.save(resource)
     end
     def delete_resource(resource)
+      ActiveSupport::Deprecation.warn "#delete_resource inside Resource deprecated. Use repository.delete instead."
       respository.delete(resource)
     end
   end

data/lib/cyrax/repository.rb

@@ -4,14 +4,27 @@ class Cyrax::Repository
   attr_accessor :accessor
   attr_accessor :params
   attr_accessor :resource_class
-  attr_accessor :finder_blocks
+  attr_accessor :finders
 
   def initialize(options = {})
     @options = options
     @accessor = options[:as]
     @params = options[:params]
     @resource_class = options[:resource_class]
-    @finder_blocks = options[:finder_blocks] || {}
+    @finders = options[:finders] || {}
+  end
+
+  def finder(name, *attrs)
+    block = finders[name]
+    instance_exec(*attrs, &block)
+  end
+
+  def finder?(name)
+    finders.has_key?(name)
+  end
+
+  def finder_or_run(name, *attrs)
+    finder?(name) ? finder(name, *attrs) : send("#{name}!", *attrs)
   end
 
   # Returns the resource class - e.g. Product by default.
@@ -25,11 +38,10 @@ class Cyrax::Repository
   #     end
   #   end
   def scope
-    if block = finder_blocks[:scope]
-      instance_exec(&block)
-    else
-      resource_class
-    end
+    finder_or_run(:scope)
+  end
+  def scope!
+    resource_class
   end
 
   # Instantiates the resource
@@ -37,66 +49,60 @@ class Cyrax::Repository
   # @param attributes [hash] Attributes you want to add to the resource
   # @return [object] The object
   def build(id, attributes = {})
-    if block = finder_blocks[:build]
-      instance_exec(id, attributes, &block)
+    finder_or_run(:build, id, attributes)
+  end
+  def build!(id, attributes = {})
+    if id.present?
+      resource = find(id)
+      resource.attributes = attributes
+      resource
     else
-      if id.present?
-        resource = find(id)
-        resource.attributes = attributes
-        resource
-      else
-        scope.new(default_attributes.merge(attributes))
-      end
+      scope.new(default_attributes.merge(attributes))
     end
   end
 
   # Finds and returns a multiple items within the scope from the DB
   # @return [Array] Array of objects
   def find_all
-    if block = finder_blocks[:find_all]
-      instance_exec(&block)
-    else
-      scope.is_a?(ActiveRecord::Relation) ? scope.load : scope.all
-    end
+    finder_or_run(:find_all)
+  end
+  def find_all!
+    defined?(ActiveRecord) && scope.is_a?(ActiveRecord::Relation) ? scope.load : scope.all
   end
 
   # Finds and returns a single item from the DB
   # @param id [int] ID of item
   # @return [object] The object
   def find(id)
-    if block = finder_blocks[:find]
-      instance_exec(id, &block)
-    else
-      scope.find(id)
-    end
+    finder_or_run(:find, id)
+  end
+  def find!(id)
+    scope.find(id)
   end
 
   # Saves a resource
   # @param resource [object] The resource to save
   def save(resource)
-    if block = finder_blocks[:save]
-      instance_exec(resource, &block)
-    else
-      resource.save
-    end
+    finder_or_run(:save, resource)
+  end
+  def save!(resource)
+    resource.save
   end
 
   # Removes a resource
   # Calls destroy method on resource
   # @param resource [object] The resource to destroy
   def delete(resource)
-    if block = finder_blocks[:delete]
-      instance_exec(resource, &block)
-    else
-      resource.destroy
-    end
+    finder_or_run(:delete, resource)
+  end
+  def delete!(resource)
+    resource.destroy
   end
 
   def default_attributes
-    if block = finder_blocks[:default_attributes]
-      instance_exec(&block)
-    else
-      {}
-    end
+    finder_or_run(:default_attributes)
+  end
+  def default_attributes!
+    {}
   end
 end

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.6.0.beta"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta
+  version: 0.6.0
 platform: ruby
 authors:
 - Droidlabs
@@ -136,9 +136,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.5