active-orient 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e808c07b0d7ea4b6ab44772dcfbed8521f1dbe1b
-  data.tar.gz: d1dc78cd6f6b0b5b8da14512e54e39777479b31c
+  metadata.gz: babcbd90fcc89be93302da2907357f3049ec4ae4
+  data.tar.gz: a5a95791f21342e4272f58a777febe243f25af3f
 SHA512:
-  metadata.gz: da1131e98ac909ba6e77526f52a6c9ae608eabe9d9a0d5d3dc2bb2a702fb7454493a2de516746e00f2d6f1f60c1bb4191393f49a28da470a3f3e87c763b624cb
-  data.tar.gz: 883ea6e68bfe1fc3a88dc4b7d9173a1a454c6141d6dfb234286aab3de1677666a0a115a022acd36049ed9cbf490abfd153287a547c67dddb9115671daf4bf9a8
+  metadata.gz: c38d7aa2efb71e1d240f613fb9b1dd72475f846601f18a8b3d7fc1bfd9c49da289a8d4e64bf9f0cd765bf8a693ef2ed8fd079ea84bb806b830d92d4ee1b27301
+  data.tar.gz: d9a94362684f5f988cc6f667c91e9094b77bf487d895dbbeab51321160d6377bc7515db4ec3bedfb3ed41846739313b3c27d9cff58a366b369b07390a88cccb5

data/README.md

@@ -6,21 +6,23 @@ The Package ist tested with Ruby 2.2.1 and Orientdb 2.1.
 
 
 To start you need a ruby 2.x Installation and a working OrientDB-Instance.  
-Clone the project and run bundle install/ bundle update,
-then modify »config/connect.yml«. 
-Its adviserable to generate the rdoc-documentation with executing
-```
-rdoc 
-```
-from the source directory of AcitiveOrient and then to load the doc-directory into any browser.
+Install the Gem the usual way
 
 For a quick start, go to the home directory of the package and start an irb-session
 
-then
+```ruby
+  require 'bundler/setup'
+  require 'active-orient'
+```
 
+First, the Database-Server has to be specified. Then we can connect to a database.
+Assuming, the server is located on localhost, we just define »default-server«
 ```ruby
-  require './config/boot'
+   ActiveOrient::OrientDB.default_server= { user: 'your user', password: 'your password' }
+
+
   r = ActiveOrient::OrientDB.new  database: 'First'
+   => I, [2015-08-18T09:49:18.858758 #88831]  INFO -- OrientDB#Connect: Connected to database First
    => #<ActiveOrient::OrientDB:0x000000048d0488 @res=#<RestClient::Resource:0x00000004927288 
        @url="http://localhost:2480", @block=nil, 
        @options={:user=>"xx", :password=>"***"}>, @database="First", @classes=[]> 

data/VERSION

@@ -0,0 +1 @@
+0.3

data/{acitve-orient.gemspec → active-orient.gemspec}

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |s|
   s.name        = "active-orient"
   s.version	= File.open('VERSION').read.strip
-  s.authors     = [" Hartmut Bischoff"]
+  s.authors     = ["Hartmut Bischoff"]
   s.email       = ["topofocus@gmail.com"]
   s.homepage    = 'https://github.com/topofocus/active-orient'
   s.licenses    = ['MIT']
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
    
   s.add_development_dependency "bundler", "~> 1.8"
   s.add_development_dependency "rake", "~> 10.0"
-  s.add_dependency 'activesupport'
-#  s.add_dependency 'rest-client', :git => 'git://github.com/rest-client/rest-client.git'
+  s.add_dependency 'activesupport', "~> 4.2"
+  s.add_dependency 'rest-client', "~> 2.0.0.alpha"
 
 end

data/lib/active-orient.rb

@@ -0,0 +1,7 @@
+require "support.rb"
+require "base.rb"
+require "base_properties.rb"
+
+require "model.rb"
+require "orient.rb"
+require "rest.rb"

data/lib/rest.rb

@@ -24,6 +24,9 @@ A Sample:
 
 class OrientDB
   mattr_accessor :logger  ## borrowed from active_support
+  mattr_accessor :default_server  ## 
+  ## expected 
+  # ActiveOrient::OrientDB.default_server = { server: 'localhost', port: 2480, user: '**', password: '**', database: 'temp'
   include OrientSupport::Support
 
 =begin
@@ -41,9 +44,13 @@ accesses the database »my_fency_database«. The database is created if its not
 initialises the Database-Connection and publishes the Instance to any ActiveOrient::Model-Object
 =end
 
+
   def initialize database: nil,  connect: true
+    self.default_server = { :server => 'localhost', :port => 2480, :protocol => 'http', 
+			    :user => 'root', :password => 'root', :database => 'temp' }.merge default_server
     @res = get_ressource
-    @database = database.presence || YAML::load_file( File.expand_path('../../config/connect.yml',__FILE__))[:orientdb][:database]
+    @database = database.presence || default_server[:database]
+    self.logger = Logger.new('/dev/stdout') unless logger.present?
 #    @database=@database#.camelcase
     connect() if connect
     # save existing classes 
@@ -57,6 +64,13 @@ initialises the Database-Connection and publishes the Instance to any ActiveOrie
   end
 ## 
 
+# called in the beginning or after a 404-Error
+def get_ressource
+  login = [ default_server[:user].to_s , default_server[:password].to_s ] 
+  server_adress = [ default_server[:protocol] ,"://" , default_server[ :server ],  ":" , default_server[ :port ]].map(&:to_s).join('')
+  RestClient::Resource.new( server_adress, *login )
+end
+
   def connect 
     i = 0
     begin
@@ -902,13 +916,6 @@ def property_uri(this_class_name)
     "property/#{ @database }/#{this_class_name}"
   end
 end
-# called in the beginning or after a 404-Error
-def get_ressource
-  read_yml = ->( key ){ YAML::load_file( File.expand_path('../../config/connect.yml',__FILE__))[:orientdb][key] }
-  login = read_yml[ :admin ].values 
-  server_adress = read_yml[ :server ] + ":" + read_yml[ :port ].to_s 
-  RestClient::Resource.new('http://' << server_adress, *login )
-end
 
 def  self.simple_uri *names
      names.each do | name |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active-orient
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
-- " Hartmut Bischoff"
+- Hartmut Bischoff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,30 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0.alpha
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.alpha
 description: Persistent ORM for OrientDB, based on ActiveModel
 email:
 - topofocus@gmail.com
@@ -65,9 +79,11 @@ files:
 - Guardfile
 - LICENSE
 - README.md
-- acitve-orient.gemspec
+- VERSION
+- active-orient.gemspec
 - config/boot.rb
 - config/connect.yml
+- lib/active-orient.rb
 - lib/base.rb
 - lib/base_properties.rb
 - lib/model.rb