shoden 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c861e4cb7f7edd9609864081c18f45913c8a82
-  data.tar.gz: af092fb9fb7046d81bc703d90900e9f2bb83905f
+  metadata.gz: 28a3009afa5b70167a8c9128a356002e11224695
+  data.tar.gz: 77efc3fd3a51f5d98ad27591657e96e56f7b9628
 SHA512:
-  metadata.gz: faef768a2f83007e65b9bbaa5ae81414166175b55fac9de499faff85445af98390409572a608f7f54a13b63d9feeeb5933599b7c263aafc4ecd345237c8ab21a
-  data.tar.gz: a24ed94a720330c281f39a88df8ba7868a72438818acb3ecafd6b97984f2afcb96a419ecb4881cc68071e990256569a8dc7e6f0f16bf67cc26678c673398de91
+  metadata.gz: 0ae31056c6817127730fdebeddd82ecf8cbff424c9dbedef97dd1674825a421c4b9725670ddaf5094828703fdb0214de600011b718aa5bdbfa4bb0c7dc837853
+  data.tar.gz: 72d6ca3fa679e24c8201ba4231228f56f6a59c6b4f399b8ec70b9566b9eda835c00750759402ceb126d684b87095d48a28d0c811422b06c7c97b6b06f9bb2e74

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+
+services: postgresql
+
+before_script:
+  - psql -c 'create database shoden_test;' -U postgres
+
+env:
+  global:
+    - DATABASE_URL=postgres://localhost:5432/shoden_test

data/lib/shoden.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'set'
 
 Sequel.extension :pg_hstore, :pg_hstore_ops
 
@@ -10,10 +11,45 @@ module Shoden
 
   Proxy = Struct.new(:klass, :parent) do
     def create(args = {})
-      key = "#{parent.class.to_reference}_id"
-      klass.create(args.merge(
-        key => parent.id
-      ))
+      klass.create(args.merge(key => parent.id))
+    end
+
+    def all
+      klass.filter(parent_filter)
+    end
+
+    def count
+      klass.count
+    end
+
+    def any?
+      count > 0
+    end
+
+    def first
+      filter = { order: "id ASC LIMIT 1" }.merge!(parent_filter)
+      klass.filter(filter).first
+    end
+
+    def last
+      filter = { order: "id DESC LIMIT 1" }.merge!(parent_filter)
+      klass.filter(filter).first
+    end
+
+    def [](id)
+      filter = { id: id }.merge!(parent_filter)
+
+      klass.filter(filter).first
+    end
+
+    private
+
+    def parent_filter
+      { key => parent.id }
+    end
+
+    def key
+      "#{parent.class.to_reference}_id".freeze
     end
   end
 
@@ -25,14 +61,28 @@ module Shoden
     @_url ||= ENV['DATABASE_URL']
   end
 
-  def self.connection
-    @_connection ||= Sequel.connect(url)
+  def self.models
+    @_models ||= Set.new
   end
 
-  def self.destroy_all
-    connection.tables.select do |t|
-      connection.drop_table(t) if t.to_s.start_with?('Shoden::')
+  def self.connection
+    loggers = []
+
+    if ENV["DEBUG"]
+      require 'logger'
+      loggers << Logger.new($stdout)
     end
+
+    @_connection ||= Sequel.connect(url, loggers: loggers)
+  end
+
+  def self.setup
+    connection.execute("CREATE EXTENSION IF NOT EXISTS hstore")
+    models.each { |m| m.setup }
+  end
+
+  def self.destroy_tables
+    models.each { |m| m.destroy_table }
   end
 
   class Model
@@ -43,12 +93,12 @@ module Shoden
     end
 
     def id
-      raise MissingID if !defined?(@_id)
+      return nil if !defined?(@_id)
       @_id.to_i
     end
 
     def destroy
-      lookup(id).delete
+      self.class.lookup(id).delete
     end
 
     def update(attrs = {})
@@ -61,32 +111,47 @@ module Shoden
     end
 
     def save
-      if defined? @_id
-        table.where(id: @_id).update data: sanitized_attrs
-      else
-        begin
-          @_id = table.insert data: sanitized_attrs
-        rescue Sequel::UniqueConstraintViolation
-          raise UniqueIndexViolation
-        end
-      end
-
-      self.class.indices.each { |i| create_index(i) }
-      self.class.uniques.each { |i| create_index(i, :unique) }
-
+      self.class.save(self)
       self
     end
 
     def load!
-      ret = lookup(@_id)
+      ret = self.class.lookup(@_id)
+      return nil if ret.nil?
       update(ret.to_a.first[:data])
       self
     end
 
+    def self.inherited(model)
+      Shoden.models.add(model)
+    end
+
+    def self.save(record)
+      if record.id
+        table.where(id: record.id).update(data: record.attributes)
+      else
+        begin
+          id = table.insert(data: record.attributes)
+          record.instance_variable_set(:@_id, id)
+        rescue Sequel::UniqueConstraintViolation
+          raise UniqueIndexViolation
+        end
+      end
+    end
+
     def self.all
       collect
     end
 
+    def self.count
+      size = 0
+      Shoden.connection.fetch("SELECT COUNT(*) FROM \"#{table_name}\"") do |r|
+        size = r[:count]
+      end
+
+      size
+    end
+
     def self.first
       collect("ORDER BY id ASC LIMIT 1").first
     end
@@ -152,15 +217,57 @@ module Shoden
       end
     end
 
+    def self.filter(conditions = {})
+      query = []
+      id = conditions.delete(:id)
+      order = conditions.delete(:order)
+
+      if id && !conditions.any?
+        rows = table.where(id: id)
+      else
+        conditions.each { |k,v| query << "data->'#{k}' = '#{v}'" }
+        seek_conditions = query.join(" AND ")
+
+        where = "WHERE (#{seek_conditions})"
+
+        where += " AND id = '#{id}'"          if id
+        order_condition = "ORDER BY #{order}" if order
+
+        sql = "#{base_query} #{where} #{order_condition}"
+
+        rows = Shoden.connection.fetch(sql) || []
+      end
+
+      rows.lazy.map do |row|
+        attrs = row[:data].merge({ id: row[:id] })
+
+        new(attrs)
+      end
+    end
+
+    def attributes
+      sanitized = @attributes.map do |k, _|
+        val = send(k)
+        return if val.nil?
+        [k, val.to_s]
+      end.compact
+
+      Sequel::Postgres::HStore.new(sanitized)
+    end
+
     private
 
+    def self.base_query
+      "SELECT * FROM \"#{table_name}\""
+    end
+
     def self.collect(condition = '')
-      models = []
+      records = []
       Shoden.connection.fetch("SELECT * FROM \"#{table_name}\" #{condition}") do |r|
         attrs = r[:data].merge(id: r[:id])
-        models << new(attrs)
+        records << new(attrs)
       end
-      models
+      records
     end
 
     def self.table_name
@@ -174,53 +281,48 @@ module Shoden
         downcase.to_sym
     end
 
-    def create_index(name, type = '')
+    def self.create_index(name, type = '')
       conn.execute <<EOS
-        CREATE #{type.upcase} INDEX index_#{self.class.name}_#{name}
+        CREATE #{type.upcase} INDEX index_#{self.name}_#{name}
         ON "#{table_name}" (( data -> '#{name}'))
         WHERE ( data ? '#{name}' );
 EOS
+    rescue
     end
 
-    def sanitized_attrs
-      sanitized = @attributes.map do |k, _|
-        val = send(k)
-        return if val.nil?
-        [k, val.to_s]
-      end.compact
-
-      Sequel::Postgres::HStore.new(sanitized)
-    end
-
-    def lookup(id)
-      raise NotFound if !conn.tables.include?(table_name.to_sym)
-
+    def self.lookup(id)
       row = table.where(id: id)
-      raise NotFound if !row.any?
+      return nil if !row.any?
 
       row
     end
 
-    def setup
-      Shoden.connection.execute("CREATE EXTENSION IF NOT EXISTS hstore")
-      Shoden.connection.create_table? table_name do
+    def self.setup
+      conn.create_table? table_name do
         primary_key :id
         hstore      :data
       end
+
+      indices.each { |i| create_index(i) }
+      uniques.each { |i| create_index(i, :unique) }
+    end
+
+    def self.destroy_all
+      conn.execute("DELETE FROM \"#{table_name}\"")
+    rescue Sequel::DatabaseError
     end
 
-    def table_name
-      self.class.table_name
+    def self.destroy_table
+      conn.drop_table(table_name)
+    rescue Sequel::DatabaseError
     end
 
-    def table
+    def self.table
       conn[table_name]
     end
 
-    def conn
-      c = Shoden.connection
-      @created ||= setup
-      c
+    def self.conn
+      Shoden.connection
     end
   end
 end

data/shoden.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "shoden"
-  s.version           = "0.3.0"
+  s.version           = "0.4.0"
   s.summary           = "Object hash mapper for postgres"
   s.description       = "Slim postgres models"
   s.authors           = ["elcuervo"]

data/test/shoden_test.rb

@@ -3,12 +3,35 @@ require 'shoden'
 
 Model = Class.new(Shoden::Model)
 
+class Person < Shoden::Model
+  attribute :email
+  attribute :origin
+
+  index  :origin
+  unique :email
+end
+
+class Tree < Shoden::Model
+  attribute   :name
+  collection  :sprouts, :Sprout
+end
+
+class Sprout < Shoden::Model
+  attribute :leaves
+  reference :tree, :Tree
+end
+
 class User < Shoden::Model
   attribute :name
 end
 
+class A < Shoden::Model
+  attribute :n, ->(x) { x.to_i }
+end
+
 setup do
-  Shoden.destroy_all
+  Shoden.destroy_tables
+  Shoden.setup
 end
 
 test 'model' do
@@ -37,17 +60,15 @@ test 'update' do
   assert_equal user.name, 'Cyril'
 end
 
-test 'relations' do
-  class Tree < Shoden::Model
-    attribute   :name
-    collection  :sprouts, :Sprout
-  end
+test 'filtering' do
+  person = { email: 'elcuervo@elcuervo.net' }
+  Person.create(person)
+  p = Person.filter(person).first
 
-  class Sprout < Shoden::Model
-    attribute :leaves
-    reference :tree, :Tree
-  end
+  assert p.email == 'elcuervo@elcuervo.net'
+end
 
+test 'relations' do
   tree = Tree.create(name: 'asd')
 
   assert tree.id
@@ -56,7 +77,14 @@ test 'relations' do
   sprout = tree.sprouts.create(leaves: 4)
 
   assert sprout.is_a?(Sprout)
+  assert tree.sprouts.all.each.is_a?(Enumerator)
+
+  assert tree.sprouts[sprout.id].id == sprout.id
+
+  assert_equal tree.sprouts.count, 1
   assert_equal sprout.tree.id, tree.id
+  assert tree.sprouts.first != nil
+  assert tree.sprouts.last != nil
 end
 
 test 'deletion' do
@@ -65,14 +93,10 @@ test 'deletion' do
 
   user.destroy
 
-  assert_raise(Shoden::NotFound) { User[id] }
+  assert_equal User[id], nil
 end
 
 test 'casting' do
-  class A < Shoden::Model
-    attribute :n, ->(x) { x.to_i }
-  end
-
   a = A.create(n: 1)
   a_prime = A[a.id]
 
@@ -80,14 +104,6 @@ test 'casting' do
 end
 
 test 'indices' do
-  class Person < Shoden::Model
-    attribute :email
-    attribute :origin
-
-    index  :origin
-    unique :email
-  end
-
   person = Person.create(email: 'elcuervo@elcuervo.net', origin: 'The internerd')
 
   assert person.id
@@ -98,9 +114,9 @@ test 'indices' do
 end
 
 test 'basic querying' do
+  User.destroy_all
   5.times { User.create }
 
   assert_equal User.all.size, 5
-  assert_equal User.first.id, 1
-  assert_equal User.last.id,  5
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoden
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - elcuervo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gems
+- .travis.yml
 - HUGS
 - LICENSE
 - README.md
@@ -80,4 +81,3 @@ specification_version: 4
 summary: Object hash mapper for postgres
 test_files:
 - test/shoden_test.rb
-has_rdoc: