active_pstore 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ddecb64b2c35e955f66716f4d39988c48d4e7bc
-  data.tar.gz: 951efa2d736bbef69a07826bd741f4d2f9742299
+  metadata.gz: 2e0846e7c7c7a6853ef77ea26f6ae2aa498d63b7
+  data.tar.gz: f12f60b9965364eca7eb3787d511a9f380fcfc75
 SHA512:
-  metadata.gz: 00ac7cace452785391cb7cc434041f0924521a6af5761de04da193bdefbd3779d72b0d50a415e37b9a3702e96abb6f7d38de828373f5350f771148a3da2aade6
-  data.tar.gz: 2db3e10910cd48e568f6abeb37f7bb2b426b3a5355cc7c4f2de8d49f5007b5aaf7dfa8b1c353b1a88d8f2caa110df7512fbcccc8399603de83a85c2701db3c1e
+  metadata.gz: 36c9f10ad414bc43ca0949fac8fbafea9ac20eb6189eaa1a7d3f412fb67abbedd28cc1f1ffe21cb58a8316c9e2060afd351592183d8d6257422eebdc19c53908
+  data.tar.gz: faf2198901dffda085992ca707df9c00c4f78377b6941a6929ac6d36f1ca7a9c777f567043f0ef8a7057517a9c549ad9d76992d306564c6b1e41ada4dab522b1

data/README.ja.md

@@ -108,6 +108,46 @@ Artist.where(birth_date: Date.new(1948, 12, 3)..Date.new(1956, 12, 6))
 
 続きは[テストコード](https://github.com/koic/active_pstore/tree/master/spec)をご参照ください。
 
+## Integration with Rails
+
+Active PStore では以下のジェネレータを用意しています。
+
+### Generate config file
+
+以下の行をRailsアプリケーションで実行してください。
+
+```
+bundle exec rails g active_pstore:config
+```
+
+config/active_pstore.yml が生成されます。
+
+config/database.yml をもちいて Active PStore が pstore を使った保存先の情報を指定します。
+
+```
+development:
+  database: db/active_pstore_development.yml
+```
+
+### Generate model file
+
+以下の行をRailsアプリケーションで実行してください。
+
+```
+bundle exec rails g active_pstore:model artist name associated_act instrument birth_date
+```
+
+app/models/artist.rb が生成されます。
+
+```ruby
+class Artist < ActivePStore::Base
+  attr_accessor :name
+  attr_accessor :associated_act
+  attr_accessor :instrument
+  attr_accessor :birth_date
+end
+```
+
 ## REQUIREMENTS
 
 * [Active Model](https://github.com/rails/rails/tree/master/activemodel)

data/README.md

@@ -109,19 +109,28 @@ see [spec codes](https://github.com/koic/active_pstore/tree/master/spec) for mor
 
 ## Integration with Rails
 
+This library has following generators.
+
 ### Generate config file
 
-Execute these lines to your Rails application directory:
+Execute these lines in your Rails application directory:
 
 ```
 bundle exec rails g active_pstore:config
 ```
 
-And then create config/active_pstore.yml.
+And then create config/active_pstore.yml
+
+Using the config/database.yml file you can specify all the information needed to access your pstore database:
+
+```
+development:
+  database: db/active_pstore_development.yml
+```
 
 ### Generate model file
 
-Execute these lines to your Rails application directory:
+Execute these lines in your Rails application directory:
 
 ```
 bundle exec rails g active_pstore:model artist name associated_act instrument birth_date

data/lib/active_pstore/application/configuration.rb

@@ -0,0 +1,27 @@
+module ActivePStore
+  module Application
+    class Configuration
+      # Loads and returns the entire raw configuration of database from
+      # values stored in `config/active_pstore.yml`.
+      def database_configuration
+        yaml = Pathname.new('config/active_pstore.yml')
+
+        config = if yaml && yaml.exist?
+          require 'yaml'
+          require 'erb'
+          YAML.load(ERB.new(yaml.read).result) || {}
+        else
+          raise 'Could not load database configuration. No such file - config/active_pstore.yml'
+        end
+
+        config
+      rescue Psych::SyntaxError => e
+        raise "YAML syntax error occurred while parsing config/active_pstore.yml. " \
+              "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
+              "Error: #{e.message}"
+      rescue => e
+        raise e, "Cannot load `Rails::ActivePStore::Railtie.database_configuration`:\n#{e.message}", e.backtrace
+      end
+    end
+  end
+end

data/lib/active_pstore/finder_methods.rb

@@ -1,9 +1,15 @@
 module ActivePStore
   module FinderMethods
-    def find(id)
-      id = id.is_a?(ActivePStore::Base) ? id.id : id
+    def find(*ids)
+      ids = ids.map {|id| id.is_a?(ActivePStore::Base) ? id.id : id }
 
-      all.find {|obj| obj.id == id } || (raise ActivePStore::RecordNotFound, "Couldn't find #{self} with 'id'=#{id}")
+      _find(*ids).tap do |ret|
+        if ids.size == 1
+          raise ActivePStore::RecordNotFound, "Couldn't find #{self} with 'id'=#{ids.first}" if ret.nil?
+        else
+          raise ActivePStore::RecordNotFound, "Couldn't find all #{self} with 'id': (#{ids.join(', ')}) (found #{ret.size} results, but was looking for #{ids.size})" unless ret.size == ids.size
+        end
+      end
     end
 
     def find_by(conditions = {})
@@ -25,5 +31,19 @@ module ActivePStore
     def take(limit = nil)
       limit ? all.take(limit) : first
     end
+
+    private
+
+    def _find(*ids)
+      if ids.size == 1
+        id = ids.first
+
+        all.find {|obj| obj.id == id }
+      else
+        ids.each_with_object([]) {|id, ret|
+          ret << _find(id)
+        }.compact
+      end
+    end
   end
 end

data/lib/active_pstore/query_methods.rb

@@ -7,7 +7,8 @@ module ActivePStore
 
       conditions.each do |key, value|
         ret = ret.select {|obj|
-          if value.is_a? Range
+          case value
+          when Array, Range
             value.include?(obj.__send__(key))
           else
             obj.__send__(key) == value

data/lib/active_pstore/railtie.rb

@@ -11,33 +11,15 @@ module Rails
         config.action_dispatch.rescue_responses.merge!(rescue_responses)
       end
 
-      # Loads and returns the entire raw configuration of database from
-      # values stored in `config/active_pstore.yml`.
-      def database_configuration
-        yaml = Pathname.new('config/active_pstore.yml')
-
-        config = if yaml && yaml.exist?
-          require 'yaml'
-          require 'erb'
-          YAML.load(ERB.new(yaml.read).result) || {}
-        else
-          raise 'Could not load database configuration. No such file - config/active_pstore.yml'
-        end
-
-        config
-      rescue Psych::SyntaxError => e
-        raise "YAML syntax error occurred while parsing config/active_pstore.yml. " \
-              "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
-              "Error: #{e.message}"
-      rescue => e
-        raise e, "Cannot load `Rails::ActivePStore::Railtie.database_configuration`:\n#{e.message}", e.backtrace
-      end
-
       initializer 'active_pstore.initialize_database' do
         config_file = Rails.root.join('config', 'active_pstore.yml')
 
         if config_file.file?
-          database = database_configuration.fetch(ENV['RAILS_ENV'] || 'development').fetch('database')
+          require 'active_pstore/application/configuration'
+
+          configuration = ::ActivePStore::Application::Configuration.new
+
+          database = configuration.database_configuration.fetch(ENV['RAILS_ENV'] || 'development').fetch('database')
 
           ::ActivePStore::Base.establish_connection(database: database)
         end

data/lib/active_pstore/version.rb

@@ -1,3 +1,3 @@
 module ActivePStore
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_pstore
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Koichi ITO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +90,7 @@ files:
 - README.ja.md
 - README.md
 - lib/active_pstore.rb
+- lib/active_pstore/application/configuration.rb
 - lib/active_pstore/attribute_methods.rb
 - lib/active_pstore/base.rb
 - lib/active_pstore/calculations.rb