humble 0.0.1374296843 → 0.0.1374368890

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a07fd88ec8a4eb23bc2664ecb4e040b9810b7955
-  data.tar.gz: 2bc6434c1fe15d55d2319d429a952c6b65f23b13
+  metadata.gz: e4d776c0dc39127d48e8304daf498aeb28e6cf3b
+  data.tar.gz: 410eae8dedd880bd4f69677258c0718a1543a69e
 SHA512:
-  metadata.gz: 6d0cf9e612c4f542c55aa47f837de75629ae6da985a4350f6d4412e7acffaf448639eff0490d98a86f58f6e69955e0705b028670bbf1da770ad2568400fc40fc
-  data.tar.gz: 607bb277179bed53fa228c8b47e46fd51508e3f4e26fa362107ea4a4b3bd8bde0338de85ff431eeba67aba8ab4b7b7c0ffbdaf4e9a2f318979f520e23b479c35
+  metadata.gz: f28e890a7ec4cc0c97086584403406166672f1dba3e3ffa7a8654893594c3d482ea219480d62ea27c6f1d46a916f4483bc1a4f0fbf87507500d0ab67b75a1efb
+  data.tar.gz: 2f3a253eab67e2f9cfe80970b44c8b2a9dcc3de1fc5158647c75acfacc777d17aedc7137ba80d7b19a1badca2661c3eef092260a09b219fa6cf4217c2e23f7bb

data/lib/humble/column.rb

@@ -1,18 +1,45 @@
 module Humble
   class Column
-    def initialize(attributes)
-      @attributes = attributes
+    def initialize(name)
+      @column_name = name
     end
 
-    def prepare_insert(item)
-      return {} if primary_key?
-      key = @attributes[:name]
-      value = item.instance_variable_get("@#{key}")
-      { key.to_sym => value }
+    def prepare(item)
+      return {} if primary_key? && has_default_value?
+      { column_name.to_sym => item.instance_variable_get("@#{column_name}") }
     end
 
     def primary_key?
-      @attributes[:primary_key]
+      false
+    end
+
+    protected
+
+    attr_reader :column_name
+  end
+
+  class PrimaryKeyColumn < Column
+    attr_reader :default
+
+    def initialize(name, default)
+      super(name)
+      @default = default
+    end
+
+    def apply(id, entity)
+      entity.instance_variable_set("@#{column_name}", id )
+    end
+
+    def destroy(connection, entity)
+      connection.where(column_name.to_sym => entity.id).delete
+    end
+
+    def primary_key?
+      true
+    end
+
+    def has_default_value?(item)
+      @default == item.id
     end
   end
 end

data/lib/humble/configuration.rb

@@ -17,7 +17,7 @@ module Humble
 
     def mapping_for(item)
       @mappings.find do |mapping|
-        mapping.is_for?(item)
+        mapping.matches?(item)
       end
     end
 

data/lib/humble/database_table.rb

@@ -11,17 +11,39 @@ module Humble
     end
 
     def primary_key(name, default: 0)
-      @columns << Column.new(:name => name, :default => default, :primary_key => true)
+      @primary_key = PrimaryKeyColumn.new(name, default)
     end
 
     def add_column(name)
-      @columns << Column.new(:name => name)
+      @columns << Column.new(name)
     end
 
-    def insert(item)
+    def persist(connection, item)
+      if @primary_key.has_default_value?(item)
+        @primary_key.apply(insert(item, connection[@name]) , item)
+      else
+        update(item, connection[@name])
+      end
+    end
+
+    def destroy(connection, entity)
+      @primary_key.destroy(connection[@name], entity)
+    end
+
+    private
+
+    def prepare_statement_for(item)
       @columns.inject({}) do |result, column|
-        result.merge(column.prepare_insert(item))
+        result.merge(column.prepare(item))
       end
     end
+
+    def insert(item, dataset)
+      dataset.insert(prepare_statement_for(item))
+    end
+
+    def update(item, dataset)
+      dataset.update(prepare_statement_for(item))
+    end
   end
 end

data/lib/humble/mapping_configuration.rb

@@ -9,13 +9,16 @@ module Humble
       ResultSet.new(connection[@table.name], mapper)
     end
 
-    def save_using(connection, item)
-      id = connection[@table.name].insert(@table.insert(item))
-      item.instance_variable_set('@id', id)
+    def save_using(connection, entity)
+      @table.persist(connection, entity)
     end
 
-    def is_for?(item)
-      item == @attributes[:type] || item.is_a?(@attributes[:type])
+    def delete_using(connection, entity)
+      @table.destroy(connection, entity)
+    end
+
+    def matches?(item)
+      self[:type] == item || item.is_a?(self[:type])
     end
 
     def [](key)
@@ -25,8 +28,7 @@ module Humble
     private
 
     def mapper
-      @attributes[:mapper] || DefaultDataRowMapper.new(self)
+      self[:mapper] || DefaultDataRowMapper.new(self)
     end
   end
-
 end

data/lib/humble/result_set.rb

@@ -15,7 +15,7 @@ module Humble
 
     def include?(item)
       self.find do |x|
-        x.id == item.id
+        x == item
       end
     end
 

data/lib/humble/session.rb

@@ -11,14 +11,18 @@ module Humble
       end
     end
 
-    def save(item)
-      mapping_for(item).save_using(create_connection, item)
+    def save(entity)
+      mapping_for(entity).save_using(create_connection, entity)
     end
 
     def find_all(clazz)
       mapping_for(clazz).find_all_using(create_connection)
     end
 
+    def delete(entity)
+      mapping_for(entity).delete_using(create_connection, entity)
+    end
+
     private
 
     attr_reader :connection_factory, :mapper_registry
@@ -27,8 +31,8 @@ module Humble
       @connection ||= connection_factory.create_connection
     end
 
-    def mapping_for(item)
-      mapper_registry.mapping_for(item)
+    def mapping_for(entity)
+      mapper_registry.mapping_for(entity)
     end
   end
 end

data/spec/integration/delete_spec.rb

@@ -0,0 +1,17 @@
+require "integration_helper"
+
+describe "deletion" do
+  include_context "orm"
+
+  context "when deleting a record" do
+    before :each do
+      connection[:movies].insert(:name => 'mo money')
+      movie = session.find_all(Movie).first
+      session.delete(movie)
+    end
+
+    it "should remove it from the database" do
+      connection[:movies].all.count.should == 0
+    end
+  end
+end

data/spec/integration/fixtures/movie_mapping.rb

@@ -5,6 +5,17 @@ class Movie
     @id = attributes[:id] || -1
     @name = attributes[:name]
   end
+
+  def name=(new_name)
+    @name = new_name
+  end
+
+  def ==(other)
+    return false unless other
+    return false if other.id == -1
+    return false if @id == -1
+    @id == other.id
+  end
 end
 
 class MovieMapping < Humble::DatabaseMapping

data/spec/integration/insert_spec.rb

@@ -0,0 +1,34 @@
+require "integration_helper"
+
+describe "orm" do
+  include_context "orm"
+
+  context "when inserting a new record" do
+    let(:movie) { Movie.new(:name => 'oop') }
+
+    before :each do
+      session.begin_transaction do |session|
+        session.save(movie)
+      end
+    end
+
+    let(:results) { connection[:movies].all }
+
+    it "should insert the correct number of records" do
+      results.count.should == 1
+    end
+
+    it "should insert the record with the a new id" do
+      results.first[:id].should_not == -1
+      results.first[:id].should > 0
+    end
+
+    it "should insert the name" do
+      results.first[:name].should == 'oop'
+    end
+
+    it "should update the new item with the new id" do
+      movie.id.should_not == -1
+    end
+  end
+end

data/spec/integration/select_spec.rb

@@ -0,0 +1,30 @@
+require "integration_helper"
+
+describe "select items" do
+  include_context "orm"
+
+  context "when fetching all items" do
+    before :each do
+      @id = connection[:movies].insert(:name => 'monsters inc')
+    end
+
+    let(:results) { session.find_all Movie }
+
+    it "should return the correct number of movies" do
+      results.count.should == 1
+    end
+
+    it "should return each movie with its name" do
+      results.first.name.should == 'monsters inc'
+    end
+
+    it "should return instances of the target type" do
+      results.first.should be_instance_of(Movie)
+    end
+
+    it "should include the saved movie" do
+      results.should include(Movie.new(:id => @id, :name => 'monsters inc'))
+    end
+  end
+
+end

data/spec/integration/update_spec.rb

@@ -0,0 +1,29 @@
+require "integration_helper"
+
+describe "updating a record" do
+  include_context "orm"
+
+  context "when updating a record" do
+    let(:movie) { Movie.new(:name => "old name") }
+
+    before :each do
+      session.begin_transaction do |session|
+        session.save(movie)
+      end
+      movie.name="new name"
+      session.begin_transaction do |session|
+        session.save(movie)
+      end
+    end
+
+    let(:results) { connection[:movies].all }
+
+    it "should save the changes" do
+      results.first[:name].should == 'new name'
+    end
+
+    it "should not create any new records" do
+      results.count.should == 1
+    end
+  end
+end

data/spec/integration_helper.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+require_relative 'integration/fixtures/movie_mapping.rb'
+
+shared_context "orm" do
+  let(:connection) { Sequel.connect(connection_string) }
+  let(:connection_string) { 'sqlite://test.db' }
+  let(:configuration) { Humble::Configuration.new(connection_string) }
+  let(:session_factory) { configuration.build_session_factory }
+  let(:session) { session_factory.create_session }
+
+  before :each do
+    connection.create_table :movies do
+      primary_key :id
+      String :name
+    end
+
+    configuration.add(MovieMapping.new)
+  end
+
+  after :each do
+    connection.drop_table :movies
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-require "rubygems"
+require 'rubygems'
 require 'sequel'
-require "sqlite3"
+require 'sqlite3'
 require 'humble'
+require 'rspec-fakes'

data/spec/unit/default_data_row_mapper_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+class Book
+  attr_reader :id, :name
+
+  def initialize(attributes)
+    @id = attributes[:id]
+    @name = attributes[:name]
+  end
+end
+
+describe Humble::DefaultDataRowMapper do
+  let(:sut) { Humble::DefaultDataRowMapper.new(configuration) }
+  let(:configuration) { { :type => Book } }
+
+  let(:result) { sut.map_from({:id => 1, :name => 'blah'}) }
+
+  it "should map the id" do
+    result.id.should == 1
+  end
+
+  it "should map the name" do
+    result.name.should == "blah"
+  end
+end

data/spec/unit/result_set_spec.rb

@@ -0,0 +1,39 @@
+require "spec_helper"
+
+describe Humble::ResultSet do
+  let(:sut) { Humble::ResultSet.new(rows, mapper) }
+  let(:mapper) { fake }
+  let(:rows) { [{:id => 1}, {id: 2}] }
+
+  before :each do
+    mapper.stub(:map_from).with({:id => 1}).and_return(1)
+    mapper.stub(:map_from).with({:id => 2}).and_return(2)
+  end
+
+  describe :inspect do
+    let(:result) { sut.inspect }
+
+    it "should display each row" do
+      result.should == "[1, 2]"
+    end
+  end
+
+  describe :each do
+    it "should visit each mapped item" do
+      collect = []
+      sut.each { |item| collect << item }
+      collect.first.should == 1
+      collect.last.should == 2
+    end
+  end
+
+  describe :include? do
+    it "should return true" do
+      sut.include?(1).should be_true
+    end
+
+    it "should return false" do
+      sut.include?(0).should be_false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: humble
 version: !ruby/object:Gem::Version
-  version: 0.0.1374296843
+  version: 0.0.1374368890
 platform: ruby
 authors:
 - mo khan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -120,7 +120,6 @@ files:
 - .ruby-version
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -137,9 +136,15 @@ files:
 - lib/humble/session.rb
 - lib/humble/session_factory.rb
 - lib/humble/version.rb
-- spec/integration/example_spec.rb
+- spec/integration/delete_spec.rb
 - spec/integration/fixtures/movie_mapping.rb
+- spec/integration/insert_spec.rb
+- spec/integration/select_spec.rb
+- spec/integration/update_spec.rb
+- spec/integration_helper.rb
 - spec/spec_helper.rb
+- spec/unit/default_data_row_mapper_spec.rb
+- spec/unit/result_set_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -165,6 +170,12 @@ signing_key:
 specification_version: 4
 summary: an nhibernate like orm for ruby.
 test_files:
-- spec/integration/example_spec.rb
+- spec/integration/delete_spec.rb
 - spec/integration/fixtures/movie_mapping.rb
+- spec/integration/insert_spec.rb
+- spec/integration/select_spec.rb
+- spec/integration/update_spec.rb
+- spec/integration_helper.rb
 - spec/spec_helper.rb
+- spec/unit/default_data_row_mapper_spec.rb
+- spec/unit/result_set_spec.rb

data/spec/integration/example_spec.rb

@@ -1,77 +0,0 @@
-require "spec_helper"
-require_relative 'fixtures/movie_mapping.rb'
-
-describe "orm" do
-  let(:connection) { Sequel.connect(connection_string) }
-  let(:connection_string) { 'sqlite://test.db' }
-  let(:configuration) { Humble::Configuration.new(connection_string) }
-  let(:session_factory) { configuration.build_session_factory }
-  let(:session) { session_factory.create_session }
-
-  before :each do
-    connection.create_table :movies do
-      primary_key :id
-      String :name
-    end
-
-    configuration.add(MovieMapping.new)
-  end
-
-  after :each do
-    connection.drop_table :movies
-  end
-
-  context "when fetching all items" do
-    before :each do
-      @id = connection[:movies].insert(:name => 'monsters inc')
-    end
-
-    let(:results) { session.find_all Movie }
-
-    it "should return the correct number of movies" do
-      results.count.should == 1
-    end
-
-    it "should return each movie with its name" do
-      results.first.name.should == 'monsters inc'
-    end
-
-    it "should return instances of the target type" do
-      results.first.should be_instance_of(Movie)
-    end
-
-    it "should include the saved movie" do
-      results.should include(Movie.new(:id => @id, :name => 'monsters inc'))
-    end
-  end
-
-  context "when inserting a new record" do
-    let(:movie) { Movie.new(:name => 'oop') }
-
-    before :each do
-      session.begin_transaction do |session|
-        session.save(movie)
-      end
-    end
-
-    let(:results) { connection[:movies].all }
-
-    it "should insert the correct number of records" do
-      results.count.should == 1
-    end
-
-    it "should insert the record with the a new id" do
-      results.first[:id].should_not == -1
-      results.first[:id].should > 0
-    end
-
-    it "should insert the name" do
-      results.first[:name].should == 'oop'
-    end
-
-    it "should update the new item with the new id" do
-      movie.id.should_not == -1
-    end
-  end
-
-end