orientdb-ar 0.0.2-jruby → 0.0.3-jruby

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.required_rubygems_version = ">= 1.3.6"
     gem.rubyforge_project         = "orientdb-ar"
 
-    gem.add_dependency "orientdb", "0.0.10"
+    gem.add_dependency "orientdb", "0.0.11"
     gem.add_dependency "activemodel", ">= 3.0.3"
     gem.add_development_dependency "awesome_print"
     gem.add_development_dependency "rspec", ">= 2.4"

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/orientdbar_console

@@ -23,6 +23,7 @@ if ARGV.include?('test:db')
   require SPEC_ROOT + '/models/person'
   require SPEC_ROOT + '/models/simple_person'
   require SPEC_ROOT + '/models/address'
+  require SPEC_ROOT + '/models/phone_number'
   require SPEC_ROOT + '/models/customer'
   require SPEC_ROOT + '/models/flo_admin'
 end

data/lib/model/base.rb

@@ -8,6 +8,8 @@ require 'orientdb'
 require 'model/conversion'
 require 'model/attributes'
 require 'model/validations'
+require 'model/relations'
+require 'model/query'
 
 class OrientDB::AR::Base
   include ActiveModel::AttributeMethods
@@ -33,9 +35,10 @@ class OrientDB::AR::Base
   attr_reader :odocument
 
   def initialize(fields = {})
-    @odocument          = self.class.new_document fields
+    @odocument          = self.class.new_document
     @changed_attributes = {}
     @errors             = ActiveModel::Errors.new(self)
+    fields.each { |k, v| send "#{k}=", v }
   end
 
   def field?(name)
@@ -118,6 +121,8 @@ class OrientDB::AR::Base
 
   class << self
 
+    include OrientDB::AR::Relations
+
     attr_writer :oclass_name
 
     def oclass_name
@@ -137,6 +142,10 @@ class OrientDB::AR::Base
       @oclass
     end
 
+    def embedded?
+      false
+    end
+
     def field(name, type, options = {})
       name = name.to_sym
       if fields.key? name
@@ -154,6 +163,7 @@ class OrientDB::AR::Base
       fields.each do |field, options|
         oclass.add field, options[:type], options.except(:type)
       end
+      self
     end
 
     def new_document(fields = {})
@@ -207,44 +217,12 @@ class OrientDB::AR::Base
       obj.instance_variable_set "@odocument", doc
       obj
     end
-  end
-
-end
-
-class OrientDB::AR::Query
-
-  attr_accessor :model, :query
 
-  def initialize(model, query = OrientDB::SQL::Query.new)
-    @model, @query = model, query
-    @query.from model.name
-  end
-
-  %w{ select select! where where! and or and_not or_not order order! limit limit! range range! }.each do |name|
-    define_method(name) do |*args|
-      query.send name, *args
-      self
+    def new_from_docs(docs)
+      docs.map { |doc| new_from_doc doc }
     end
   end
 
-  def all
-    model.connection.query(query).map { |doc| model.new_from_doc doc }
-  end
-
-  def first
-    model.new_from_doc model.connection.first(query)
-  end
-
-  def results
-    model.connection.query(query).map
-  end
-
-  def inspect
-    %{#<OrientDB::AR::Query:#{model.name} query="#{query.to_s}">}
-  end
-
-  alias :to_s :inspect
-
 end
 
 OrientDB::AR::Base.include_root_in_json = false

data/lib/model/embedded.rb

@@ -1,13 +1,21 @@
-require 'model/attributes'
-require 'model/validations'
-
 class OrientDB::AR::Embedded
+  include ActiveModel::AttributeMethods
+  include Comparable
+
   extend ActiveModel::Translation
 
   include OrientDB::AR::Attributes
   include OrientDB::AR::Conversion
   include OrientDB::AR::Validations
 
+  include ActiveModel::Serializers::JSON
+  include ActiveModel::Serializers::Xml
+
+  class_inheritable_hash :fields
+  self.fields = ActiveSupport::OrderedHash.new
+
+  attr_reader :odocument
+
   def initialize(fields = {})
     @odocument          = self.class.new_document fields
     @changed_attributes = {}
@@ -15,7 +23,8 @@ class OrientDB::AR::Embedded
   end
 
   def field?(name)
-    @odocument.field?(name)
+    res = @odocument.field?(name)
+    res
   end
 
   def respond_to?(method_name)
@@ -49,20 +58,65 @@ class OrientDB::AR::Embedded
     end
   end
 
+  def save
+    raise "Not implemented on Embedded models"
+  end
+
+  def delete
+    raise "Not implemented on Embedded models"
+  end
+
+  def saved?
+    false
+  end
+
+  def deleted?
+    false
+  end
+
+  def persisted?
+    false
+  end
+
+  def inspect
+    attrs       = attributes.map { |k, v| "#{k}:#{v.inspect}" }.join(' ')
+    super_klass = self.class.descends_from_embedded? ? '' : "(#{self.class.superclass.name})"
+    %{#<#{self.class.name}#{super_klass}:#{@odocument.rid} #{attrs}>}
+  end
+
+  alias :to_s :inspect
+
+  def <=>(other)
+    to_s <=> other.to_s
+  end
+
   class << self
 
+    def connection
+      OrientDB::AR::Base.connection
+    end
+
     attr_writer :oclass_name
 
     def oclass_name
-      @oclass_name ||= name.downcase.gsub('::', '_')
+      @oclass_name ||= name.to_s
     end
 
     def oclass
-      @oclass ||= connection.get_or_create_class oclass_name
+      unless defined?(@oclass)
+        options = {}
+        unless descends_from_embedded?
+          super_oclass          = superclass.oclass
+          options[:super]       = super_oclass
+          options[:use_cluster] = super_oclass.cluster_ids.first
+        end
+        @oclass = connection.get_or_create_class oclass_name, options
+      end
+      @oclass
     end
 
-    def fields
-      @fields ||= ActiveSupport::OrderedHash.new
+    def embedded?
+      true
     end
 
     def field(name, type, options = {})
@@ -74,10 +128,70 @@ class OrientDB::AR::Embedded
       end
     end
 
+    def descends_from_embedded?
+      superclass && superclass == OrientDB::AR::Embedded
+    end
+
+    def schema!
+      fields.each do |field, options|
+        oclass.add field, options[:type], options.except(:type)
+      end
+      self
+    end
+
     def new_document(fields = {})
       oclass
       OrientDB::Document.new connection, oclass_name, fields
     end
 
+    def create(fields = {})
+      raise "Not implemented on Embedded models"
+    end
+
+    def select(*args)
+      raise "Not implemented on Embedded models"
+    end
+
+    alias :columns :select
+
+    def where(*args)
+      raise "Not implemented on Embedded models"
+    end
+
+    def order(*args)
+      raise "Not implemented on Embedded models"
+    end
+
+    def limit(max_records)
+      raise "Not implemented on Embedded models"
+    end
+
+    def range(lower_rid, upper_rid = nil)
+      raise "Not implemented on Embedded models"
+    end
+
+    def all(conditions = {})
+      raise "Not implemented on Embedded models"
+    end
+
+    def first(conditions = {})
+      raise "Not implemented on Embedded models"
+    end
+
+    def clear
+      raise "Not implemented on Embedded models"
+    end
+
+    def new_from_doc(doc)
+      klass = doc.getClassName.constantize
+      obj   = klass.new
+      obj.instance_variable_set "@odocument", doc
+      obj
+    end
+
+    def new_from_docs(docs)
+      docs.map { |doc| new_from_doc doc }
+    end
   end
+
 end

data/lib/model/query.rb

@@ -0,0 +1,36 @@
+class OrientDB::AR::Query
+
+  attr_accessor :model, :query
+
+  def initialize(model, query = OrientDB::SQL::Query.new)
+    @model, @query = model, query
+    @query.from model.name
+  end
+
+  %w{ select select! where where! and or and_not or_not order order! limit limit! range range! }.each do |name|
+    define_method(name) do |*args|
+      query.send name, *args
+      self
+    end
+  end
+
+  def all
+    model.connection.query(query).map { |doc| model.new_from_doc doc }
+  end
+
+  def first
+    model.new_from_doc model.connection.first(query)
+  end
+
+  def results
+    model.connection.query(query).map
+  end
+
+  def inspect
+    %{#<OrientDB::AR::Query:#{model.name} query="#{query.to_s}">}
+  end
+
+  alias :to_s :inspect
+
+end
+

data/lib/model/relations.rb

@@ -0,0 +1,70 @@
+module OrientDB::AR
+  module Relations
+
+    def has_one(klass, options = {})
+      klass = klass_for klass
+      name = options[:name].to_s || field_name_for(klass, true)
+
+      field_type = klass.embedded? ? :embedded : :link
+      field name, [OrientDB::FIELD_TYPES[field_type], klass.oclass]
+
+      class_eval <<-eorb, __FILE__, __LINE__ + 1
+        def #{name}                                                          # def address
+          doc = odocument[:#{name}]                                          #   doc = odocument[:address]
+          doc ? #{klass.name}.new_from_doc(doc) : nil                        #   doc ? Address.new_from_doc(doc) : nil
+        end                                                                  # end
+      eorb
+                                                                             #
+      class_eval <<-eorb, __FILE__, __LINE__ + 1
+        def #{name}=(value)                                                  # def address=(value)
+          raise "Invalid value for [#{name}]" unless value.is_a?(#{klass})   #   raise "Invalid value for [address]" unless value.is_a?(Address)
+          odocument[:#{name}] = value.odocument                              #   odocument[:address] = value.odocument
+          #{name}                                                            #   address
+        end                                                                  # end
+      eorb
+    end
+
+    def has_many(klass, options = {})
+      klass = klass_for klass
+      name = options[:name].to_s || field_name_for(klass, false)
+
+      field_type = klass.embedded? ? :embedded : :link
+      field name, [OrientDB::FIELD_TYPES[field_type], klass.oclass]
+
+      class_eval <<-eorb, __FILE__, __LINE__ + 1
+        def #{name}                                         # def addresses
+          docs = odocument[:#{name}]                        #   docs = odocument[:addresses]
+          docs ? #{klass.name}.new_from_docs(docs) : nil    #   docs ? Address.new_from_docs(doc) : nil
+        end                                                 # end
+      eorb
+
+      class_eval <<-eorb, __FILE__, __LINE__ + 1
+        def #{name}=(value)                                 # def addresses=(value)
+          odocument[:#{name}] = value.map{|x| x.odocument } #   odocument[:addresses] = value.map{|x| x.odocument }
+          #{name}                                           #   addresses
+        end                                                 # end
+      eorb
+
+      class_eval <<-eorb, __FILE__, __LINE__ + 1
+        def add_#{name.singularize}(value)                 # def add_address(value)
+          odocument[:#{name}] << value.odocument            #   odocument[:addresses] << value.odocument
+          #{name}                                           #   addresses
+        end                                                 # end
+      eorb
+    end
+
+    private
+
+    def klass_for(klass)
+      return klass if klass.class.name == 'Class'
+      klass.to_s.singularize.camelize.constantize
+    rescue
+      raise "Problem getting klass for [#{klass}]"
+    end
+
+    def field_name_for(klass, singular)
+      klass.to_s.underscore.send(singular ? :singularize : :pluralize).gsub('/', '__')
+    end
+
+  end
+end

data/orientdb-ar.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orientdb-ar}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.platform = %q{jruby}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Madrid"]
-  s.date = %q{2011-01-17}
+  s.date = %q{2011-01-18}
   s.default_executable = %q{orientdbar_console}
   s.description = %q{Active Model wrappers to persist Ruby objects under OrientDB in JRuby.}
   s.email = ["aemadrid@gmail.com"]
@@ -32,6 +32,8 @@ Gem::Specification.new do |s|
     "lib/model/base.rb",
     "lib/model/conversion.rb",
     "lib/model/embedded.rb",
+    "lib/model/query.rb",
+    "lib/model/relations.rb",
     "lib/model/validations.rb",
     "lib/orientdb-ar.rb",
     "orientdb-ar.gemspec",
@@ -44,6 +46,7 @@ Gem::Specification.new do |s|
     "spec/models/customer.rb",
     "spec/models/flo_admin.rb",
     "spec/models/person.rb",
+    "spec/models/phone_number.rb",
     "spec/models/simple_person.rb",
     "spec/serialization_spec.rb",
     "spec/spec.opts",
@@ -60,18 +63,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<orientdb>, ["= 0.0.10"])
+      s.add_runtime_dependency(%q<orientdb>, ["= 0.0.11"])
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0.3"])
       s.add_development_dependency(%q<awesome_print>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.4"])
     else
-      s.add_dependency(%q<orientdb>, ["= 0.0.10"])
+      s.add_dependency(%q<orientdb>, ["= 0.0.11"])
       s.add_dependency(%q<activemodel>, [">= 3.0.3"])
       s.add_dependency(%q<awesome_print>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.4"])
     end
   else
-    s.add_dependency(%q<orientdb>, ["= 0.0.10"])
+    s.add_dependency(%q<orientdb>, ["= 0.0.11"])
     s.add_dependency(%q<activemodel>, [">= 3.0.3"])
     s.add_dependency(%q<awesome_print>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.4"])

data/spec/model_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Model" do
+
   it "should have a valid connection" do
     Person.connection.should be_a_kind_of OrientDB::Database
   end
@@ -27,6 +28,18 @@ describe "Model" do
     p2.tags.map.should == p.tags
   end
 
+  it "should handle embedded models as relations" do
+    Customer.clear
+
+    a = Address.new :street => "123 S Main", :city => "Salt Lake", :state => "UT", :country => "USA"
+    p1 = PhoneNumber.new :number => "123456789"
+    p2 = PhoneNumber.new :number => "987654321"
+    c1 = Customer.create :name => "Albert Einstein", :number => 1, :address => a, :phones => [p1, p2]
+
+    c2 = Customer.first
+    c1.should == c2
+  end
+
   it "should find models" do
     OrientDB::SQL.monkey_patch! Symbol
     Person.clear
@@ -42,4 +55,5 @@ describe "Model" do
     Person.where("'jedi' IN tags").all.should == [p2, p3]
     Person.where("'fighter' IN tags", :age.lte(28)).order(:name.desc).all.first.should == p4
   end
+
 end

data/spec/models/address.rb

@@ -5,3 +5,4 @@ class Address < OrientDB::AR::Embedded
   field :zip, :string
   field :country, :string
 end
+Address.schema!

data/spec/models/customer.rb

@@ -1,5 +1,6 @@
 class Customer < Person
   field :number, :int, :not_null => true
-#  field :address, Address
+  has_one Address, :name => :address
+  has_many PhoneNumber, :name => :phones
 end
 Customer.schema!

data/spec/models/phone_number.rb

@@ -0,0 +1,6 @@
+class PhoneNumber < OrientDB::AR::Embedded
+  field :type, :string
+  field :number, :string
+  field :extension, :string
+end
+PhoneNumber.schema!

data/spec/models/simple_person.rb

@@ -1,5 +1,4 @@
 class SimplePerson < OrientDB::AR::Base
   field :name, :string
 end
-
 SimplePerson.schema!

data/spec/spec_helper.rb

@@ -28,6 +28,7 @@ unless defined?(SPEC_HELPER_LOADED)
 
   require SPEC_ROOT + '/models/person'
   require SPEC_ROOT + '/models/simple_person'
+  require SPEC_ROOT + '/models/phone_number'
   require SPEC_ROOT + '/models/address'
   require SPEC_ROOT + '/models/customer'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 2
-  version: 0.0.2
+    - 3
+  version: 0.0.3
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -07:00
+date: 2011-01-18 00:00:00 -07:00
 default_executable: orientdbar_console
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
             segments: 
               - 0
               - 0
-              - 10
-            version: 0.0.10
+              - 11
+            version: 0.0.11
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -93,6 +93,8 @@ files:
   - lib/model/base.rb
   - lib/model/conversion.rb
   - lib/model/embedded.rb
+  - lib/model/query.rb
+  - lib/model/relations.rb
   - lib/model/validations.rb
   - lib/orientdb-ar.rb
   - orientdb-ar.gemspec
@@ -105,6 +107,7 @@ files:
   - spec/models/customer.rb
   - spec/models/flo_admin.rb
   - spec/models/person.rb
+  - spec/models/phone_number.rb
   - spec/models/simple_person.rb
   - spec/serialization_spec.rb
   - spec/spec.opts