active_pstore 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f3816ea1ca51415462ac3f9e404a002758a3a62
-  data.tar.gz: 5542b80a872c4321edcc1543dd58202f97073815
+  metadata.gz: b8e9351722c286fca7c3d7479e1b0bf92cc76550
+  data.tar.gz: 5ab5c558ffaae1f4e6bf6fd9b395dde4d1b8c95d
 SHA512:
-  metadata.gz: 4a34726b07509bf18d78c1d7ad56683df663472d5d8f7667d82470532238e3c8f41de902969e690e66633a17980b325cbbef4032e65ba1b4c7152941e486306e
-  data.tar.gz: 1f64d02dc1bbb0424742faa569385b488216b538d5cbcfef0cb2cd6157a5d4794196e6eb2c9e35faa3702fb169292b057d3e4631c50e28bcd8c4d3385af96388
+  metadata.gz: 6652d3af6d54d323985c5fd6b65e07c93f9d88d3833e47318e515bba39cb82bd8f7d0a9ad32256e42482ddcce2ef159a10e61004f3b179b49bd5520e87a48f39
+  data.tar.gz: 4c34716b4c75ef5aa4e598f23660d21c56826701c8ad106a0483cef097cc83d14efee74f756b33c0938cbdca1d7b78b1644e74306e7c4ac63e1e4a3c8be8f98a

data/lib/active_pstore.rb

@@ -9,6 +9,7 @@ require 'active_pstore/delegation'
 require 'active_pstore/dynamic_matchers'
 require 'active_pstore/finder_methods'
 require 'active_pstore/inheritance'
+require 'active_pstore/integration'
 require 'active_pstore/model_schema'
 require 'active_pstore/persistence'
 require 'active_pstore/query_methods'

data/lib/active_pstore/attribute_methods.rb

@@ -7,5 +7,13 @@ module ActivePStore
         raise "undefined method `#{attr}'"
       end
     end
+
+    def []=(attr, value)
+      if respond_to? "#{attr}=".to_sym
+        self.__send__("#{attr}=".to_sym, value)
+      else
+        raise "undefined method `#{attr}='"
+      end
+    end
   end
 end

data/lib/active_pstore/base.rb

@@ -13,6 +13,7 @@ module ActivePStore
     include ActiveModel::Model
     include ActivePStore::AttributeMethods
     include ActivePStore::Core
+    include ActivePStore::Integration
     include ActivePStore::Persistence
 
     def initialize(attributes = nil)
@@ -55,6 +56,10 @@ module ActivePStore
       def find_or_create_by(attributes, &block)
         find_by(attributes) || create(attributes, &block)
       end
+
+      def find_or_initialize_by(attributes, &block)
+        find_by(attributes) || new(attributes, &block)
+      end
     end
   end
 end

data/lib/active_pstore/generators/active_pstore/config/config_generator.rb

@@ -1,15 +1,14 @@
-# encoding: utf-8
 require 'rails/generators/active_pstore_generator'
 
 module Active_Pstore
   module Generators
     class ConfigGenerator < Rails::Generators::Base
-      desc "Creates a Active_Pstore configuration file at config/active_pstore.yml"
+      desc 'Creates a Active_Pstore configuration file at config/active_pstore.yml'
 
-      argument :database_name, type: :string, optional: true
+#      argument :database_name, type: :string, optional: true
 
       def self.source_root
-        @_active_pstore_source_root ||= File.expand_path("../templates", __FILE__)
+        @_active_pstore_source_root ||= File.expand_path('../templates', __FILE__)
       end
 
       def app_name
@@ -17,7 +16,7 @@ module Active_Pstore
       end
 
       def create_config_file
-        template 'active_pstore.yml', File.join('config', "active_pstore.yml")
+        template 'active_pstore.yml', File.join('config', 'active_pstore.yml')
       end
     end
   end

data/lib/active_pstore/generators/active_pstore/config/template/active_pstore.yml

@@ -1,135 +1,20 @@
-development:
-  # Configure available database clients. (required)
-  clients:
-    # Defines the default client. (required)
-    default:
-      # Defines the name of the default database that Mongoid can connect to.
-      # (required).
-      database: <%= database_name || app_name %>_development
-      # Provides the hosts the default client can connect to. Must be an array
-      # of host:port pairs. (required)
-      hosts:
-        - localhost:27017
-      options:
-        # Change the default write concern. (default = { w: 1 })
-        # write:
-        #   w: 1
-
-        # Change the default read preference. Valid options for mode are: :secondary,
-        # :secondary_preferred, :primary, :primary_preferred, :nearest
-        # (default: primary)
-        # read:
-        #   mode: :secondary_preferred
-
-        # The name of the user for authentication.
-        # user: 'user'
-
-        # The password of the user for authentication.
-        # password: 'password'
-
-        # The user's database roles.
-        # roles:
-        #   - 'dbOwner'
-
-        # Change the default authentication mechanism. Valid options are: :scram,
-        # :mongodb_cr, :mongodb_x509, and :plain. (default on 3.0 is :scram, default
-        # on 2.4 and 2.6 is :plain)
-        # auth_mech: :scram
-
-        # The database or source to authenticate the user against. (default: admin)
-        # auth_source: admin
-
-        # Force a the driver cluster to behave in a certain manner instead of auto-
-        # discovering. Can be one of: :direct, :replica_set, :sharded. Set to :direct
-        # when connecting to hidden members of a replica set.
-        # connect: :direct
-
-        # Changes the default time in seconds the server monitors refresh their status
-        # via ismaster commands. (default: 10)
-        # heartbeat_frequency: 10
-
-        # The time in seconds for selecting servers for a near read preference. (default: 5)
-        # local_threshold: 5
-
-        # The timeout in seconds for selecting a server for an operation. (default: 30)
-        # server_selection_timeout: 30
-
-        # The maximum number of connections in the connection pool. (default: 5)
-        # max_pool_size: 5
-
-        # The minimum number of connections in the connection pool. (default: 1)
-        # min_pool_size: 1
-
-        # The time to wait, in seconds, in the connection pool for a connection
-        # to be checked in before timing out. (default: 5)
-        # wait_queue_timeout: 5
-
-        # The time to wait to establish a connection before timing out, in seconds.
-        # (default: 5)
-        # connect_timeout: 5
-
-        # The timeout to wait to execute operations on a socket before raising an error.
-        # (default: 5)
-        # socket_timeout: 5
+#
+#   Ensure the Active PStore gem is defined in your Gemfile
+#   gem 'active_pstore'
+#
+default: &default
 
-        # The name of the replica set to connect to. Servers provided as seeds that do
-        # not belong to this replica set will be ignored.
-        # replica_set: name
-
-        # Whether to connect to the servers via ssl. (default: false)
-        # ssl: true
-
-        # The certificate file used to identify the connection against MongoDB.
-        # ssl_cert: /path/to/my.cert
-
-        # The private keyfile used to identify the connection against MongoDB.
-        # Note that even if the key is stored in the same file as the certificate,
-        # both need to be explicitly specified.
-        # ssl_key: /path/to/my.key
-
-        # A passphrase for the private key.
-        # ssl_key_pass_phrase: password
-
-        # Whether or not to do peer certification validation. (default: false)
-        # ssl_verify: true
-
-        # The file containing a set of concatenated certification authority certifications
-        # used to validate certs passed from the other end of the connection.
-        # ssl_ca_cert: /path/to/ca.cert
-
-
-  # Configure Mongoid specific options. (optional)
-  options:
-    # Includes the root model name in json serialization. (default: false)
-    # include_root_in_json: false
-
-    # Include the _type field in serialization. (default: false)
-    # include_type_for_serialization: false
-
-    # Preload all models in development, needed when models use
-    # inheritance. (default: false)
-    # preload_models: false
-
-    # Raise an error when performing a #find and the document is not found.
-    # (default: true)
-    # raise_not_found_error: true
-
-    # Raise an error when defining a scope with the same name as an
-    # existing method. (default: false)
-    # scope_overwrite_exception: false
-
-    # Use Active Support's time zone in conversions. (default: true)
-    # use_activesupport_time_zone: true
+development:
+  <<: *default
+  database: db/active_pstore_development.yml
 
-    # Ensure all times are UTC in the app side. (default: false)
-    # use_utc: false
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
 test:
-  clients:
-    default:
-      database: <%= database_name || app_name %>_test
-      hosts:
-        - localhost:27017
-      options:
-        read:
-          mode: primary
-        max_pool_size: 1
+  <<: *default
+  database: db/active_pstore_test.yml
+
+production:
+  <<: *default
+  database: db/active_pstore_production.yml

data/lib/active_pstore/generators/active_pstore/model/model_generator.rb

@@ -1,8 +1,9 @@
-require "rails/generators/active_pstore_generator"
+require 'rails/generators/active_pstore_generator'
 
 module ActivePStore
   module Generators
-    class ModelGenerator < Base
+#    class ModelGenerator < Base
+    class ModelGenerator < Rails::Generators::Base
 
       desc "Creates a ActivePStore model"
       argument :attributes, type: :array, default: [], banner: "attribute attribute"
@@ -14,7 +15,7 @@ module ActivePStore
 #      class_option :collection, type: :string, desc: "The collection for storing model's documents"
 
       def create_model_file
-        template "model.rb.tt", File.join("app/models", class_path, "#{file_name}.rb")
+        template 'model.rb.tt', File.join('app/models', class_path, "#{file_name}.rb")
       end
 
       hook_for :test_framework

data/lib/active_pstore/generators/active_pstore/model/templates/model.rb.tt

@@ -1,6 +1,6 @@
 <% module_namespacing do -%>
 class <%= class_name %> < ActivePStore::Base
-<% attributes.reject {|attr| attr.reference?}.each do |attribute| -%>
+<% attributes.reject {|attr| attr.reference? }.each do |attribute| -%>
   attr_reader :<%= attribute.name %>
 <% end -%>
 end

data/lib/active_pstore/generators/active_pstore_generator.rb

@@ -26,4 +26,3 @@ module Rails
     end
   end
 =end
-end

data/lib/active_pstore/integration.rb

@@ -0,0 +1,7 @@
+module ActivePStore
+  module Integration
+    def to_param
+      id && id.to_s
+    end
+  end
+end

data/lib/active_pstore/persistence.rb

@@ -16,6 +16,10 @@ module ActivePStore
       @id.nil?
     end
 
+    def persisted?
+      !new_record?
+    end
+
     def save
       ActivePStore::Base.use_connection do |connection|
         if new_record?

data/lib/active_pstore/railtie.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #require "mongoid/railties/document"
 require 'rails'
 require 'rails/active_pstore'

data/lib/active_pstore/version.rb

@@ -1,3 +1,3 @@
 module ActivePStore
-  VERSION = '0.4.9'
+  VERSION = '0.4.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_pstore
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Koichi ITO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -78,6 +78,7 @@ files:
 - lib/active_pstore/generators/active_pstore/model/templates/model.rb.tt
 - lib/active_pstore/generators/active_pstore_generator.rb
 - lib/active_pstore/inheritance.rb
+- lib/active_pstore/integration.rb
 - lib/active_pstore/model_schema.rb
 - lib/active_pstore/persistence.rb
 - lib/active_pstore/query_methods.rb