djoini 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b3802abe0a8d26e8c6528ec5145e1b6663c67b
-  data.tar.gz: e9cc697da02e1806e08263375596c1a473854ef4
+  metadata.gz: 870f9cfc0a600280051364300fb115d5a713d2fc
+  data.tar.gz: 73c7d52393c9f1153dce426a8eeed869e44c647e
 SHA512:
-  metadata.gz: 91166b816f3d316209b132e9b5245a6a5730a9e2a191ea59f588ebd604040fac92e570ea51206bc1b6a70293f0a7249a38943f492c3576ab683d54bae617fded
-  data.tar.gz: 01f7881c0eb9e3ac9ef1b0ad528b633cd208d2e44fad36065eb9a95e487d975f819104df4b0b6e052a24fae6f0135d0662262c8c5c8b3fce624d0e1ec6175fda
+  metadata.gz: ed50e4c22e6c7bce5324b515790ecad6469e8f25fd4e2476a6c58fa74878f99cb760fedcdedeab698ee629c2a7ba73f865f465a5494e2b73e2c423db923f60f1
+  data.tar.gz: 57676310a0640557db3a1adf8c847d324d54eb772c5dc4965f61c067c443a1e4cdb9c5e30f8e88c56854a47a4ab4721979577018e1ec623382056e82f1fac1b0

data/README.md

@@ -1,6 +1,7 @@
 # Djoini
+[![Build Status](https://travis-ci.org/Faulik/djoini.svg?branch=master)](https://travis-ci.org/Faulik/djoini)
 
-DJsOnINI is a implimentation of ActiveModel pattern and a fixture loader for json and ini formats. It implement's only a little part of pattern, so isn't usable in serious applications.
+DJsOnINI is a implementation of ActiveRecord pattern and a fixture loader for json and ini formats. It implement's only a little part of pattern, so isn't usable in serious applications.
 
 Thing's that are implemented:
 - Djoini::Base class to inherit from
@@ -38,7 +39,7 @@ Or install it yourself as:
 **Important**
 Make appropriate tables or use other gem to create migrations. This gem doesn't handle migrations only mapping and loading.
 
-Also you need to create database.yml in your `PWD/config/` folder with  atleast this content to use local db with specified credentials.
+Also you need to create database.yml in your `PWD/config/` folder with  at least this content to use local db with specified credentials.
 
 ```yaml
 postgres:
@@ -60,7 +61,7 @@ class Post < Djoini::Base # Inherit from Base class to use the power of ActiveRe
 end
 ```
 
-After that just use them like you normaly would with ActiveModel:
+After that just use them like you normaly would with ActiveRecord:
 
 ```ruby
 user = User.create(name: 'Jack', last_name: 'Daniels')
@@ -75,6 +76,9 @@ user.destroy
 For more examples see tests.
 
 ### Rake task usage
+
+Example app can be found at https://github.com/Faulik/djoini_example .
+
 **Important**
 - With `mixed` loading .ini files will be loaded first.
 - All file names must be named after coresponding tables, not models.
@@ -92,7 +96,7 @@ To load fixtures all fixtures(both ini and json) from default directory(`PWD/db/
 bundle exec rake djoini:load
 ```
 
-To load only ini fixtures, overrides options in config file:
+To load only `ini` fixtures, overrides options in config file:
 
 ```
 bundle exec rake djoini:load[ini]
@@ -108,19 +112,10 @@ end
 ```
 Djoini will try to find `PWD/config/initializers/djoini.rb` and load it.
 
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake false` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/faullik/djoini. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/Rakefile

@@ -1,2 +1 @@
 require 'bundler/gem_tasks'
-import './lib/tasks/load.rake'

data/config/database.yml

@@ -0,0 +1,11 @@
+postgres:
+  adapter: postgresql
+  db_name: djoini_test
+  username: ruby
+  password: noway
+
+test:
+  adapter: postgresql
+  db_name: djoini_test
+  username: ruby
+  password: noway

data/config/database.yml.travis

@@ -0,0 +1,4 @@
+test:
+  adapter: postgresql
+  db_name: travis_ci_test
+  username: postgres

data/lib/djoini/connection.rb

@@ -1,5 +1,6 @@
 require 'singleton'
 require 'pg'
+require 'yaml'
 
 # Holds connection singleton class
 module Djoini
@@ -11,21 +12,32 @@ module Djoini
   class Connection
     include Singleton
 
-    attr_reader :conn
+    def conn
+      db || load_database
+    end
 
     def establish_connection(params)
       _adapter = params.fetch('adapter', 'postgres')
       _username = params.fetch('username')
-      _password = params.fetch('password')
+      _password = params.fetch('password', '')
       _host = params.fetch('host', 'localhost')
       _port = params.fetch('port', '5432')
       _db_name = params.fetch('db_name')
 
-      @conn = PG.connect("#{_adapter}://#{_username}:#{_password}@#{_host}:#{_port}/#{_db_name}")
+      self.db = PG.connect("#{_adapter}://#{_username}:#{_password}@#{_host}:#{_port}/#{_db_name}")
+    end
+
+    def self.load_database(db_name = 'postgres')
+      _db_config_path = File.join(Dir.pwd, '/config/database.yml')
+
+      fail unless File.file?(_db_config_path)
+
+      _conn_config = YAML.load(File.read(_db_config_path))
+      Djoini::Connection.instance.establish_connection(_conn_config[db_name])
     end
 
     private
 
-    attr_writer :conn
+    attr_accessor :db
   end
 end

data/lib/djoini/version.rb

@@ -1,3 +1,3 @@
 module Djoini
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 end

data/lib/tasks/load.rake

@@ -6,8 +6,6 @@ namespace :djoini do
 
     load_configuration
 
-    load_database
-
     _loader = Djoini::Files.new
 
     _type = args[:type] || Djoini.configuration.fixtures_type
@@ -24,15 +22,4 @@ namespace :djoini do
     # To make sure configure was called if initializer wasn't found
     Djoini.configure {}
   end
-
-  def load_database
-    require 'yaml'
-
-    _db_config_path = File.join(Dir.pwd, '/config/database.yml')
-
-    fail unless File.file?(_db_config_path)
-
-    _conn_config = YAML.load(File.read(_db_config_path))
-    Djoini::Connection.instance.establish_connection(_conn_config['postgres'])
-  end
 end

data/spec/djoini/model_spec.rb

@@ -54,4 +54,18 @@ describe Djoini::Base do
       expect(_users[0].last_name).to eq 'Beggins'
     end
   end
+
+  context 'nonexisting table ' do
+    it 'expected to 0 rows' do
+      _table = Djoini::Table.new(name: 'NonExist')
+
+      expect(_table.columns.count).to eq 0
+    end
+
+    it 'expected to fail on insert' do
+      _table = Djoini::Table.new(name: 'NonExist')
+
+      expect { _table.insert(name: 'Bull') }.to raise_error(RuntimeError)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,19 @@
 require 'rubygems'
-require 'yaml'
 require 'pry'
 
 require_relative '../lib/djoini'
 
-conn_info = YAML.load(File.read(File.dirname(__FILE__) + '/database.yml'))
+Djoini::Connection.load_database('test')
 
-Djoini::Connection.instance.establish_connection(conn_info['postgres'])
+Djoini.db.exec("CREATE TABLE IF NOT EXISTS users
+  (
+    id SERIAL,
+    name text,
+    last_name text,
+    age integer,
+    CONSTRAINT user_pk PRIMARY KEY (id)
+  )
+")
 
 require_relative 'models/post'
 require_relative 'models/user'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djoini
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - faul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -119,6 +119,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/database.yml
+- config/database.yml.travis
 - lib/djoini.rb
 - lib/djoini/base.rb
 - lib/djoini/composite.rb
@@ -134,7 +136,6 @@ files:
 - lib/djoini/table.rb
 - lib/djoini/version.rb
 - lib/tasks/load.rake
-- spec/database.yml
 - spec/djoini/model_spec.rb
 - spec/djoini/task_fixtures/users.ini
 - spec/djoini/task_fixtures/users.json
@@ -167,7 +168,6 @@ signing_key:
 specification_version: 4
 summary: Implimentation of ActiveModel pattern and a fixture loader
 test_files:
-- spec/database.yml
 - spec/djoini/model_spec.rb
 - spec/djoini/task_fixtures/users.ini
 - spec/djoini/task_fixtures/users.json

data/spec/database.yml

@@ -1,5 +0,0 @@
-postgres:
-  adapter: postgresql
-  db_name: djoini_test
-  username: ruby
-  password: noway