lotus-model 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b8be05452d72973dfe52baddeb52b8510c65f2
-  data.tar.gz: 4786325b8907e16e408259da3e1ff56846739d32
+  metadata.gz: aa3a89ff8d50e481fffb8cbd68c8cc38bb97e52a
+  data.tar.gz: c1205c925a3cadac434c381d8f80dd5a15846544
 SHA512:
-  metadata.gz: 2a98aa092e3e74a6a15ec494b51360142ed6cdf1d1f153a9b70c769f68eae47b54af4e0c74c3de6bbe8b1abeda6abf9eb0c6d23c47859f14b8b3337208f8abb7
-  data.tar.gz: a41f041635936b946c3f0870839457e25d33cfaa7af81e2f03f6434cc7c38d21cf7d9562897001d2fd54061c6a11ed7531da66df37d6b69d93629a7d5dc7aeb5
+  metadata.gz: 573a4b357ec946e3945e819279fe646f72b22144da46e3d8a1f7adf140d6845e9811fad860bd33cd97afcc5587bac93a470489c73ae7e5355be7e463c453d5cd
+  data.tar.gz: 2d380bd41f0f1d3f934d1d4b74e036126f34f5fc0207a3066549c0ab9f31fd5c930f06ffea5baa081734b9dd02de19a34028e3a51cc3094ba99f1e1e9a260f46

data/CHANGELOG.md

@@ -1,9 +1,19 @@
 # Lotus::Model
 A persistence layer for Lotus
 
+## v0.3.0 - 2015-03-23
+### Added
+- [Linus Pettersson] Database console
+
+### Fixed
+- [Alfonso Uceda Pompa] Don't send unwanted null values to the database, while coercing entities
+- [Jan Lelis] Do not define top-level `Boolean`, because it is already defined by `lotus-utils`
+- [Vsevolod Romashov] Fix entity class resolving in `Coercer#from_record`
+- [Jason Harrelson] Add file and line to `instance_eval` in `Coercer` to make backtrace more usable
+
 ## v0.2.4 - 2015-02-20
 ### Fixed
-- [Luca Guidi] When duplicate the framework don't copy over the original `Lotus::Model` configuration.
+- [Luca Guidi] When duplicate the framework don't copy over the original `Lotus::Model` configuration
 
 ## v0.2.3 - 2015-02-13
 ### Added

data/lib/lotus/model/adapters/abstract.rb

@@ -12,6 +12,17 @@ module Lotus
       class DatabaseAdapterNotFound < ::StandardError
       end
 
+      # It's raised when an adapter does not support a feature.
+      #
+      # Example: When we try to get a connection string for the current database
+      # but the adapter has not implemented it.
+      #
+      # @see Lotus::Model::Adapters::Abstract#connection_string
+      #
+      # @since 0.3.0
+      class NotSupportedError < ::StandardError
+      end
+
       # Abstract adapter.
       #
       # An adapter is a concrete implementation that allows a repository to
@@ -180,6 +191,16 @@ module Lotus
         def transaction(options = {})
           raise NotImplementedError
         end
+
+        # Returns a string which can be executed to start a console suitable
+        # for the configured database.
+        #
+        # @return [String] to be executed to start a database console
+        #
+        # @since 0.3.0
+        def connection_string
+          raise NotSupportedError
+        end
       end
     end
   end

data/lib/lotus/model/adapters/memory/query.rb

@@ -100,7 +100,7 @@ module Lotus
           #        .where(framework: 'lotus')
           def where(condition)
             column, value = _expand_condition(condition)
-            conditions.push([:where, Proc.new{ find_all{|r| r.fetch(column) == value} }])
+            conditions.push([:where, Proc.new{ find_all{|r| r.fetch(column, nil) == value} }])
             self
           end
 

data/lib/lotus/model/adapters/sql/console.rb

@@ -0,0 +1,33 @@
+module Lotus
+  module Model
+    module Adapters
+      module Sql
+        class Console
+          extend Forwardable
+
+          def_delegator :console, :connection_string
+
+          def initialize(uri)
+            @uri = URI.parse(uri)
+          end
+
+          private
+
+          def console
+            case @uri.scheme
+            when 'sqlite'
+              require 'lotus/model/adapters/sql/consoles/sqlite'
+              Consoles::Sqlite.new(@uri)
+            when 'postgres'
+              require 'lotus/model/adapters/sql/consoles/postgresql'
+              Consoles::Postgresql.new(@uri)
+            when 'mysql', 'mysql2'
+              require 'lotus/model/adapters/sql/consoles/mysql'
+              Consoles::Mysql.new(@uri)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lotus/model/adapters/sql/consoles/mysql.rb

@@ -0,0 +1,49 @@
+require 'shellwords'
+module Lotus
+  module Model
+    module Adapters
+      module Sql
+        module Consoles
+          class Mysql
+            def initialize(uri)
+              @uri = uri
+            end
+
+            def connection_string
+              str = 'mysql'
+              str << host
+              str << database
+              str << port if port
+              str << username if username
+              str << password if password
+              str
+            end
+
+            private
+
+            def host
+              " -h #{@uri.host}"
+            end
+
+            def database
+              " -D #{@uri.path.sub(/^\//, '')}"
+            end
+
+            def port
+              " -P #{@uri.port}" if @uri.port
+            end
+
+            def username
+              " -u #{@uri.user}" if @uri.user
+            end
+
+            def password
+              " -p #{@uri.password}" if @uri.password
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/lotus/model/adapters/sql/consoles/postgresql.rb

@@ -0,0 +1,48 @@
+require 'shellwords'
+module Lotus
+  module Model
+    module Adapters
+      module Sql
+        module Consoles
+          class Postgresql
+            def initialize(uri)
+              @uri = uri
+            end
+
+            def connection_string
+              configure_password
+              str = 'psql'
+              str << host
+              str << database
+              str << port if port
+              str << username if username
+              str
+            end
+
+            private
+
+            def host
+              " -h #{@uri.host}"
+            end
+
+            def database
+              " -d #{@uri.path.sub(/^\//, '')}"
+            end
+
+            def port
+              " -p #{@uri.port}" if @uri.port
+            end
+
+            def username
+              " -U #{@uri.user}" if @uri.user
+            end
+
+            def configure_password
+              ENV['PGPASSWORD'] = @uri.password if @uri.password
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lotus/model/adapters/sql/consoles/sqlite.rb

@@ -0,0 +1,26 @@
+require 'shellwords'
+module Lotus
+  module Model
+    module Adapters
+      module Sql
+        module Consoles
+          class Sqlite
+            def initialize(uri)
+              @uri = uri
+            end
+
+            def connection_string
+              "sqlite3 #{@uri.host}#{database}"
+            end
+
+            private
+
+            def database
+              Shellwords.escape(@uri.path)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lotus/model/adapters/sql_adapter.rb

@@ -3,6 +3,7 @@ require 'lotus/model/adapters/implementation'
 require 'lotus/model/adapters/sql/collection'
 require 'lotus/model/adapters/sql/command'
 require 'lotus/model/adapters/sql/query'
+require 'lotus/model/adapters/sql/console'
 require 'sequel'
 
 module Lotus
@@ -215,6 +216,17 @@ module Lotus
           end
         end
 
+        # Returns a string which can be executed to start a console suitable
+        # for the configured database, adding the necessary CLI flags, such as
+        # url, password, port number etc.
+        #
+        # @return [String]
+        #
+        # @since 0.3.0
+        def connection_string
+          Sql::Console.new(@uri).connection_string
+        end
+
         private
 
         # Returns a collection from the given name.

data/lib/lotus/model/config/adapter.rb

@@ -28,7 +28,7 @@ module Lotus
       #     adapter type: :sql, uri: 'postgres://localhost/database'
       #   end
       #
-      #   Lotus::Model.adapter_config
+      #   Lotus::Model.configuration.adapter_config
       #   # => Lotus::Model::Config::Adapter(type: :sql, uri: 'postgres://localhost/database')
       #
       # By convention, Lotus inflects type to find the adapter class

data/lib/lotus/model/configuration.rb

@@ -91,7 +91,7 @@ module Lotus
       #     adapter type: :sql, uri: 'sqlite3://localhost/database'
       #   end
       #
-      #   Lotus::Model.adapter_config
+      #   Lotus::Model.configuration.adapter_config
       #
       # @since 0.2.0
       def adapter(options = nil)

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

@@ -60,12 +60,14 @@ module Lotus
               if entity.id
                 Hash[#{ @collection.attributes.map{|name,(klass,mapped)| ":#{mapped},Lotus::Model::Mapping::Coercions.#{klass}(entity.#{name})"}.join(',') }]
               else
-                Hash[#{ @collection.attributes.reject{|name,_| name == @collection.identity }.map{|name,(klass,mapped)| ":#{mapped},Lotus::Model::Mapping::Coercions.#{klass}(entity.#{name})"}.join(',') }]
+                Hash[].tap do |record|
+                  #{ @collection.attributes.reject{|name,_| name == @collection.identity }.map{|name,(klass,mapped)| "value = Lotus::Model::Mapping::Coercions.#{klass}(entity.#{name}); record[:#{mapped}] = value unless value.nil?"}.join('; ') }
+                end
               end
             end
 
             def from_record(record)
-              #{ @collection.entity }.new(
+              ::#{ @collection.entity }.new(
                 Hash[#{ @collection.attributes.map{|name,(klass,mapped)| ":#{name},Lotus::Model::Mapping::Coercions.#{klass}(record[:#{mapped}])"}.join(',') }]
               )
             end
@@ -77,4 +79,3 @@ module Lotus
     end
   end
 end
-

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

@@ -35,25 +35,6 @@ module Lotus
         # @see Lotus::Repository
         REPOSITORY_SUFFIX = 'Repository'.freeze
 
-        # Defines top level constant for attribute usage.
-        #
-        # @since 0.1.0
-        #
-        # @see Lotus::Model::Mapping::Collection#attribute
-        #
-        # @example
-        #   require 'lotus/model'
-        #
-        #   mapper = Lotus::Model::Mapper.new do
-        #     collection :articles do
-        #       entity Article
-        #
-        #       attribute :published, Boolean
-        #     end
-        #   end
-        class ::Boolean
-        end
-
         # @attr_reader name [Symbol] the name of the collection
         #
         # @since 0.1.0

data/lib/lotus/model/version.rb

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

data/lotus-model.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_runtime_dependency 'lotus-utils', '~> 0.3', '>= 0.3.2'
+  spec.add_runtime_dependency 'lotus-utils', '~> 0.4'
   spec.add_runtime_dependency 'sequel',      '~> 4.9'
 
   spec.add_development_dependency 'bundler',  '~> 1.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotus-model
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils
@@ -17,20 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +107,10 @@ files:
 - lib/lotus/model/adapters/null_adapter.rb
 - lib/lotus/model/adapters/sql/collection.rb
 - lib/lotus/model/adapters/sql/command.rb
+- lib/lotus/model/adapters/sql/console.rb
+- lib/lotus/model/adapters/sql/consoles/mysql.rb
+- lib/lotus/model/adapters/sql/consoles/postgresql.rb
+- 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/config/adapter.rb