depository 0.1.1 → 0.1.2

data/lib/depository/collection.rb

@@ -2,61 +2,68 @@ require 'attr_protected'
 require 'forwardable'
 
 require 'depository/sequel'
+require 'depository/collection_config'
 
 module Depository
-  RecordNotFound        = Class.new(StandardError)
-  UnknownConversionType = Class.new(StandardError)
+  RecordNotFound        = Class.new(RuntimeError)
+  UnknownConversionType = Class.new(RuntimeError)
 
   class Collection
     class << self
-      attr_protected :_model_block, :_model_class, :_db_name
-
       extend Forwardable
 
       def_delegators :db, *DatasetMethods
 
-      def use_model(&block)
-        self._model_block = block
-      end
-
-      def _model
-        self._model_class ||= _model_block.call
-      end
-
-      def use_db(db)
-        db.is_a?(Symbol) ? self._db_name = db : @_db = Result.new(db, self)
+      def config
+        @_config ||= CollectionConfig.new
       end
 
       def db
-        @_db ||= Result.new(Database[_db_name], self)
+        Result.new(config.db, self)
       end
 
-      def primary_key
-        @_primary_key ||= :id
+      def scope(name, blk)
+        define_singleton_method(name) { |*args| instance_exec *args, &blk }
       end
 
-      def primary_key=(key)
-        @_primary_key = key
+      def find_by(key, value)
+        where(key => value).first
       end
 
       def save(model)
-        if model.send(primary_key)
-          update(model.to_hash)
+        if model.send(config.primary_key)
+          db.where(config.primary_key => model.send(config.primary_key)).
+            update(model.to_hash)
         else
-          model.send(:"#{primary_key}=", insert(model.to_hash))
-          return model
+          model.send(:"#{config.primary_key}=", db.insert(model.to_hash))
         end
+
+        return model
+      end
+
+      def create(attrs)
+        save(config.model.new(attrs))
+      end
+
+      def update(*args, &blk)
+        model = find(*args)
+
+        blk.call(model)
+        save(model)
+        model
       end
 
       def find(key)
-        result = where(primary_key => key).first
-        return result if !result.nil?
+        result = key.nil? ? nil : where(config.primary_key => key).first
+
         raise RecordNotFound,
-          "no record found in collection `#{_db_name}' with id `#{key}'"
+          "no record found in collection with id `#{key.inspect}'" if result.nil?
+
+        return result
       end
 
       def delete(key)
-        db.where(primary_key => key).delete
+        db.where(config.primary_key => key).delete
       end
 
       def convert(attrs)
@@ -64,7 +71,7 @@ module Depository
         when Array
           attrs.map(&method(:convert))
         when Hash
-          _model.new(attrs)
+          config.model.new(attrs)
         else
           raise UnknownConversionType, "unable to convert #{attrs.inspect}"
         end

data/lib/depository/collection_config.rb

@@ -0,0 +1,34 @@
+require 'attr_protected'
+require 'depository/database'
+
+module Depository
+  class CollectionConfig
+    attr_protected :_model_block
+
+    def model(&block)
+      if block_given?
+        self._model_block = block
+      else
+        @_model ||= _model_block.call
+      end
+    end
+
+    def db(&block)
+      if block_given?
+        @_db_block = block
+        @_db = nil
+      else
+        value = @_db_block.call
+        @_db ||= value.is_a?(Symbol) ? Database[value] : value
+      end
+    end
+
+    def primary_key(value = nil)
+      if value
+        @_primary_key = value
+      else
+        @_primary_key ||= :id
+      end
+    end
+  end
+end

data/lib/depository/database.rb

@@ -11,10 +11,6 @@ module Depository
         self.db = db
       end
 
-      def db_for(collection)
-        Result.new(self.db[collection._db_name], collection)
-      end
-
       def [](name)
         self.db[name]
       end

data/lib/depository/model.rb

@@ -23,7 +23,7 @@ module Depository
       end
     end
 
-    def initialize(attrs)
+    def initialize(attrs = {})
       set(attrs)
       _defaults.each { |key, val| set(key, val) if !get(key) }
     end
@@ -31,7 +31,7 @@ module Depository
     def to_hash
       _fields.reduce({}) do |acc, field|
         acc.merge(field => get(field))
-      end.reject { |key, val| val.nil? }
+      end
     end
 
     def get(attr)
@@ -44,13 +44,15 @@ module Depository
       else
         public_send(:"#{attr}=", value)
       end
+
+      return self
     end
 
     def ==(other)
       other.is_a?(self.class) && other.to_hash == to_hash
     end
 
-    private
+  private
 
     def _fields
       self.class._fields

data/lib/depository/result.rb

@@ -43,7 +43,7 @@ module Depository
     end
 
     def ==(other)
-      all == other
+      self.all == other
     end
     alias_method :eql?, :==
 

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: depository
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
+  prerelease: 
 platform: ruby
 authors:
 - Brian Pratt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -33,6 +36,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_protected
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -43,6 +47,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -53,6 +58,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +69,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -73,6 +80,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +91,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +106,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/depository/collection.rb
+- lib/depository/collection_config.rb
 - lib/depository/database.rb
 - lib/depository/model.rb
 - lib/depository/result.rb
@@ -104,25 +114,26 @@ files:
 homepage: https://github.com/pratt121/depository
 licenses:
 - WTFPL
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: simple interface for persistence built on Sequel
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Nzc3Y2Q3NzJmZDAxMjI4N2RmZmRlYjJlOGQ3NjVkZmZjNGE2ZjFjZA==
-  data.tar.gz: !binary |-
-    ZmM5M2QxMGM3NTdlY2NiMDg4N2EzN2FjOTVhNmUxNjZlYTIyY2Q3OQ==
-SHA512:
-  metadata.gz: !binary |-
-    YWQ5MjZjYTdkMGZjYTk0MjY0MGMwOWFlOTBjMTVmNTIyOTg0ZmRjODIwNzky
-    YWI1ODBiMzk3MGNjYWJjMmNiNDQ3ODRjYjBhMDkxNDM1MjQ4NTVjOWU3MGIw
-    MTIyYjAzMjFiNzc4NGYxZmE3MDcwOTMwZGI4YTQ1NzM1ODg5MzM=
-  data.tar.gz: !binary |-
-    MjljZDc0MGI0OWJlMGUxM2U1MTJiYWY1MGMwZDkxYzE5NzExOWFkOTcyYWUz
-    NTU0MTdlODcwNWM1MmM0NTQ5ZGJiODA2ODc3NzdhZTljNmFjMTdlYTU5YWI3
-    MWMzZmYwOGVlYTc5MDE5MDM1ODIwMGE0ZWUyZDE2ZmQzOTNjZGM=