lotus-model 0.4.1 → 0.5.0

data/lib/lotus/model/migrator/postgres_adapter.rb

@@ -25,21 +25,32 @@ module Lotus
         # @since 0.4.0
         # @api private
         def create
-          `createdb #{ database } #{ create_options }`
+          set_environment_variables
+          `createdb #{ database }`
         end
 
         # @since 0.4.0
         # @api private
         def drop
-          new_connection.run %(DROP DATABASE "#{ database }")
-        rescue Sequel::DatabaseError => e
-          message = if e.message.match(/does not exist/)
-            "Cannot find database: #{ database }"
-          else
-            e.message
-          end
+          set_environment_variables
+
+          require 'open3'
+
+          Open3.popen3('dropdb', database) do |stdin, stdout, stderr, wait_thr|
+            exit_status = wait_thr.value
+
+            unless exit_status.success?
+              error_message = stderr.read
 
-          raise MigrationError.new(message)
+              message = if error_message.match(/does not exist/)
+                "Cannot find database: #{ database }"
+              else
+                message
+              end
+
+              raise MigrationError.new(message)
+            end
+          end
         end
 
         # @since 0.4.0
@@ -59,14 +70,6 @@ module Lotus
 
         private
 
-        # @since 0.4.0
-        # @api private
-        def create_options
-          result  = ""
-          result += %( --owner=#{ username }) unless username.nil?
-          result
-        end
-
         # @since 0.4.0
         # @api private
         def set_environment_variables

data/lib/lotus/model/migrator/sqlite_adapter.rb

@@ -38,7 +38,7 @@ module Lotus
         def create
           path.dirname.mkpath
           FileUtils.touch(path)
-        rescue Errno::EACCES
+        rescue Errno::EACCES, Errno::EPERM
           raise MigrationError.new("Permission denied: #{ path.sub(/\A\/\//, '') }")
         end
 
@@ -69,7 +69,7 @@ module Lotus
         # @api private
         def path
           root.join(
-            @connection.uri.sub(/#{ @connection.adapter_scheme }\:\/\//, '')
+            @connection.uri.sub(/(jdbc\:|)sqlite\:\/\//, '')
           )
         end
 

data/lib/lotus/model/version.rb

@@ -3,6 +3,6 @@ module Lotus
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.4.1'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

data/lib/lotus/repository.rb

@@ -212,11 +212,17 @@ module Lotus
         @adapter = adapter
       end
 
+      # @since 0.5.0
+      # @api private
+      def adapter
+        @adapter
+      end
+
       # Creates or updates a record in the database for the given entity.
       #
       # @param entity [#id, #id=] the entity to persist
       #
-      # @return [Object] the entity
+      # @return [Object] a copy of the entity with `id` assigned
       #
       # @since 0.1.0
       #
@@ -233,8 +239,9 @@ module Lotus
       #   article = Article.new(title: 'Introducing Lotus::Model')
       #   article.id # => nil
       #
-      #   ArticleRepository.persist(article) # creates a record
-      #   article.id # => 23
+      #   persisted_article = ArticleRepository.persist(article) # creates a record
+      #   article.id # => nil
+      #   persisted_article.id # => 23
       #
       # @example With a persisted entity
       #   require 'lotus/model'
@@ -257,13 +264,13 @@ module Lotus
       end
 
       # Creates a record in the database for the given entity.
-      # It assigns the `id` attribute, in case of success.
+      # It returns a copy of the entity with `id` assigned.
       #
       # If already persisted (`id` present) it does nothing.
       #
       # @param entity [#id,#id=] the entity to create
       #
-      # @return [Object] the entity
+      # @return [Object] a copy of the entity with `id` assigned
       #
       # @since 0.1.0
       #
@@ -279,10 +286,16 @@ module Lotus
       #   article = Article.new(title: 'Introducing Lotus::Model')
       #   article.id # => nil
       #
-      #   ArticleRepository.create(article) # creates a record
-      #   article.id # => 23
+      #   created_article = ArticleRepository.create(article) # creates a record
+      #   article.id # => nil
+      #   created_article.id # => 23
+      #
+      #   created_article = ArticleRepository.create(article)
+      #   created_article.id # => 24
+      #
+      #   created_article = ArticleRepository.create(existing_article) # => no-op
+      #   created_article # => nil
       #
-      #   ArticleRepository.create(article) # no-op
       def create(entity)
         unless _persisted?(entity)
           _touch(entity)
@@ -552,6 +565,7 @@ module Lotus
       end
 
       private
+
       # Executes the given raw statement on the adapter.
       #
       # Please note that it's only supported by some databases,
@@ -561,12 +575,13 @@ module Lotus
       # For advanced scenarios, please check the documentation of each adapter.
       #
       # @param raw [String] the raw statement to execute on the connection
-      # @return [Object] the raw result set from SQL adapter
+      #
+      # @return [NilClass]
       #
       # @raise [NotImplementedError] if current Lotus::Model adapter doesn't
       #   implement `execute`.
       #
-      # @raise [Lotus::Model::InvalidQueryError] if raw statement is invalid
+      # @raise [Lotus::Model::InvalidCommandError] if the raw statement is invalid
       #
       # @see Lotus::Model::Adapters::Abstract#execute
       # @see Lotus::Model::Adapters::SqlAdapter#execute
@@ -583,21 +598,122 @@ module Lotus
       #
       #   class ArticleRepository
       #     include Lotus::Repository
-      #   end
-      #
-      #   article = Article.new(title: 'Introducing transactions',
-      #     body: 'lorem ipsum')
       #
-      #   result_set = ArticleRepository.execute("SELECT * FROM articles")
-      #   result_set.each_hash do |result|
-      #     result # -> { id: 123, title: "Introducing transactions", body: "lorem ipsum"}
+      #     def self.reset_comments_count
+      #       execute "UPDATE articles SET comments_count = 0"
+      #     end
       #   end
       #
-      #   puts result_set.class # => SQLite3::ResultSet
+      #   ArticleRepository.reset_comments_count
       def execute(raw)
         @adapter.execute(raw)
       end
 
+      # Fetch raw result sets for the the given statement.
+      #
+      # PLEASE NOTE: The returned result set contains an array of hashes.
+      #              The columns are returned as they are from the database,
+      #              the mapper is bypassed here.
+      #
+      # @param raw [String] the raw statement used to fetch records
+      # @param blk [Proc] an optional block that is yielded for each record
+      #
+      # @return [Enumerable<Hash>,Array<Hash>] the collection of raw records
+      #
+      # @raise [NotImplementedError] if current Lotus::Model adapter doesn't
+      #   implement `fetch`.
+      #
+      # @raise [Lotus::Model::InvalidQueryError] if the raw statement is invalid
+      #
+      # @since 0.5.0
+      #
+      # @example Basic Usage
+      #   require 'lotus/model'
+      #
+      #   mapping do
+      #     collection :articles do
+      #       attribute :id,    Integer, as: :s_id
+      #       attribute :title, String,  as: :s_title
+      #     end
+      #   end
+      #
+      #   class Article
+      #     include Lotus::Entity
+      #     attributes :title, :body
+      #   end
+      #
+      #   class ArticleRepository
+      #     include Lotus::Repository
+      #
+      #     def self.all_raw
+      #       fetch("SELECT * FROM articles")
+      #     end
+      #   end
+      #
+      #   ArticleRepository.all_raw
+      #     # => [{:_id=>1, :user_id=>nil, :s_title=>"Art 1", :comments_count=>nil, :umapped_column=>nil}]
+      #
+      # @example Map A Value From Result Set
+      #   require 'lotus/model'
+      #
+      #   mapping do
+      #     collection :articles do
+      #       attribute :id,    Integer, as: :s_id
+      #       attribute :title, String,  as: :s_title
+      #     end
+      #   end
+      #
+      #   class Article
+      #     include Lotus::Entity
+      #     attributes :title, :body
+      #   end
+      #
+      #   class ArticleRepository
+      #     include Lotus::Repository
+      #
+      #     def self.titles
+      #       fetch("SELECT s_title FROM articles").map do |article|
+      #         article[:s_title]
+      #       end
+      #     end
+      #   end
+      #
+      #   ArticleRepository.titles # => ["Announcing Lotus v0.5.0"]
+      #
+      # @example Passing A Block
+      #   require 'lotus/model'
+      #
+      #   mapping do
+      #     collection :articles do
+      #       attribute :id,    Integer, as: :s_id
+      #       attribute :title, String,  as: :s_title
+      #     end
+      #   end
+      #
+      #   class Article
+      #     include Lotus::Entity
+      #     attributes :title, :body
+      #   end
+      #
+      #   class ArticleRepository
+      #     include Lotus::Repository
+      #
+      #     def self.titles
+      #       result = []
+      #
+      #       fetch("SELECT s_title FROM articles") do |article|
+      #         result << article[:s_title]
+      #       end
+      #
+      #       result
+      #     end
+      #   end
+      #
+      #   ArticleRepository.titles # => ["Announcing Lotus v0.5.0"]
+      def fetch(raw, &blk)
+        @adapter.fetch(raw, &blk)
+      end
+
       # Fabricates a query and yields the given block to access the low level
       # APIs exposed by the query itself.
       #

data/lotus-model.gemspec

@@ -6,7 +6,7 @@ require 'lotus/model/version'
 Gem::Specification.new do |spec|
   spec.name          = 'lotus-model'
   spec.version       = Lotus::Model::VERSION
-  spec.authors       = ['Luca Guidi', 'Trung Lê', 'Alfonso Uceda Pompa']
+  spec.authors       = ['Luca Guidi', 'Trung Lê', 'Alfonso Uceda']
   spec.email         = ['me@lucaguidi.com', 'trung.le@ruby-journal.com', 'uceda73@gmail.com']
   spec.summary       = %q{A persistence layer for Lotus}
   spec.description   = %q{A persistence framework with entities, repositories, data mapper and query objects}

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: lotus-model
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Luca Guidi
 - Trung Lê
-- Alfonso Uceda Pompa
+- Alfonso Uceda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils
@@ -116,16 +116,19 @@ files:
 - lib/lotus/model/adapters/sql/consoles/sqlite.rb
 - lib/lotus/model/adapters/sql/query.rb
 - lib/lotus/model/adapters/sql_adapter.rb
+- lib/lotus/model/coercer.rb
 - lib/lotus/model/config/adapter.rb
 - lib/lotus/model/config/mapper.rb
 - lib/lotus/model/configuration.rb
 - lib/lotus/model/mapper.rb
 - lib/lotus/model/mapping.rb
-- lib/lotus/model/mapping/coercer.rb
-- lib/lotus/model/mapping/coercions.rb
+- lib/lotus/model/mapping/attribute.rb
+- lib/lotus/model/mapping/coercers.rb
 - lib/lotus/model/mapping/collection.rb
+- lib/lotus/model/mapping/collection_coercer.rb
 - lib/lotus/model/migrator.rb
 - lib/lotus/model/migrator/adapter.rb
+- lib/lotus/model/migrator/connection.rb
 - lib/lotus/model/migrator/mysql_adapter.rb
 - lib/lotus/model/migrator/postgres_adapter.rb
 - lib/lotus/model/migrator/sqlite_adapter.rb
@@ -152,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A persistence layer for Lotus

data/lib/lotus/model/mapping/coercions.rb

@@ -1,192 +0,0 @@
-require 'lotus/utils/kernel'
-
-module Lotus
-  module Model
-    module Mapping
-      # Coercions utilities
-      #
-      # @since 0.1.1
-      module Coercions
-        # Coerce into an Array, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [Array] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.1.1
-        #
-        # @see http://ruby-doc.org/core/Kernel.html#method-i-Array
-        def self.Array(arg)
-          ::Kernel.Array(arg) unless arg.nil?
-        end
-
-        # Coerce into a Boolean, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [Boolean] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.1.1
-        #
-        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Boolean-class_method
-        def self.Boolean(arg)
-          Utils::Kernel.Boolean(arg) unless arg.nil?
-        end
-
-        # Coerce into a Date, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [Date] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.1.1
-        #
-        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Date-class_method
-        def self.Date(arg)
-          Utils::Kernel.Date(arg) unless arg.nil?
-        end
-
-        # Coerce into a DateTime, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [DateTime] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.1.1
-        #
-        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#DateTime-class_method
-        def self.DateTime(arg)
-          Utils::Kernel.DateTime(arg) unless arg.nil?
-        end
-
-        # Coerce into a Float, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [Float] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.1.1
-        #
-        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Float-class_method
-        def self.Float(arg)
-          Utils::Kernel.Float(arg) unless arg.nil?
-        end
-
-        # Coerce into a Hash, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [Hash] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.1.1
-        #
-        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Hash-class_method
-        def self.Hash(arg)
-          Utils::Kernel.Hash(arg) unless arg.nil?
-        end
-
-        # Coerce into an Integer, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [Integer] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.1.1
-        #
-        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Integer-class_method
-        def self.Integer(arg)
-          Utils::Kernel.Integer(arg) unless arg.nil?
-        end
-
-        # Coerce into a BigDecimal, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [BigDecimal] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.2.0
-        #
-        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#BigDecimal-class_method
-        def self.BigDecimal(arg)
-          Utils::Kernel.BigDecimal(arg) unless arg.nil?
-        end
-
-        # Coerce into a Set, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [Set] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.1.1
-        #
-        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Set-class_method
-        def self.Set(arg)
-          Utils::Kernel.Set(arg) unless arg.nil?
-        end
-
-        # Coerce into a String, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [String] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.1.1
-        #
-        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#String-class_method
-        def self.String(arg)
-          Utils::Kernel.String(arg) unless arg.nil?
-        end
-
-        # Coerce into a Symbol, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [Symbol] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.2.0
-        #
-        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Symbol-class_method
-        def self.Symbol(arg)
-          Utils::Kernel.Symbol(arg) unless arg.nil?
-        end
-
-        # Coerce into a Time, unless the argument is nil
-        #
-        # @param arg [Object] the object to coerce
-        #
-        # @return [Time] the result of the coercion
-        #
-        # @raise [TypeError] if the argument can't be coerced
-        #
-        # @since 0.1.1
-        #
-        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Time-class_method
-        def self.Time(arg)
-          Utils::Kernel.Time(arg) unless arg.nil?
-        end
-      end
-    end
-  end
-end