openbill-ruby 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e6652a8bf159b897cafbf2696f43515fcf41aa6
-  data.tar.gz: c35248bd384ee35a8ab5e374865145b33f92b281
+  metadata.gz: fece53206838ee77a91700fa51f423e195e16a35
+  data.tar.gz: fd9126c93d7d8e57fadb32c247676b46884e1f90
 SHA512:
-  metadata.gz: aebdd2e263542803b3d367f72d7e078e9d1f84b02a76edf87a61825a2861769c460c42702076cc7930dc7a6640ce1a8167ce457ca717e257cdc366f6e734f823
-  data.tar.gz: ef5ff4174d7b3815c6468820aec561d0e4f82dccc5c41670fb8439f3c8e7c9803ffe9a2569516563ef9e9ce9f2be172a4a748c67cd816b20543a98cd25680ea2
+  metadata.gz: f236888aded1c32b29ffc31a2d1a31cc1387333f82693a83cdb2fbdd059984d569970a5f2e7d4a4fd712ece23cc4f0983b3397ef766c2068539719c235e0e290
+  data.tar.gz: e9b78877fc40b00b99161663411dc48f9ae8f99c1033a4fe852c0b17b026024ae999963b9189b3a17b5df999556d35f1c91d475c6cf6ae0b6001210539120330

data/CHANGELOG.md

@@ -0,0 +1 @@
+* Rename Openbill.current to Openbill.service

data/db/migrate/20160320150928_add_openbill.rb

@@ -1,20 +1,5 @@
-class AddOpenbill < ActiveRecord::Migration
-  def up
-    Dir.entries(sql_dir).select{|f| File.file? sql_dir + f }.sort.each do |file|
-      say_with_time "Migrate with #{file}" do
-        execute File.read sql_dir + file
-      end
-    end
-  end
-
-  def down
-    execute "DROP TABLE openbill_accounts CASCADE"
-    execute "DROP TABLE openbill_transactions CASCADE"
-  end
+require 'openbill/migration'
 
-  private
-
-  def sql_dir
-    Openbill.root + '/sql/'
-  end
+class AddOpenbill < ActiveRecord::Migration
+  include Openbill::Migration
 end

data/lib/openbill.rb

@@ -1,7 +1,9 @@
 require 'openbill/engine'
+
 module Openbill
-  autoload :Service,       'openbill/service'
+  autoload :Category,      'openbill/category'
   autoload :Account,       'openbill/account'
+  autoload :Service,       'openbill/service'
   autoload :Transaction,   'openbill/transaction'
   autoload :Configuration, 'openbill/configuration'
   autoload :Registry,      'openbill/registry'
@@ -17,6 +19,7 @@ module Openbill
 
     def configure
       yield self.config
+      service
     end
 
     def config
@@ -24,9 +27,20 @@ module Openbill
     end
 
     def current
-      return @current if @current
+      deprecate 'Openbill.current is deprecated. Use Openbill.service instead'
+      service
+    end
+
+    # Return default Openbill::Service instance
+    #
+    def service
+      return @service if @service
+
+      @service = Openbill::Service.new config
+    end
 
-      @current = Openbill::Service.new config
+    def deprecate(message)
+      STDERR.puts "DEPRECATE: #{message}"
     end
   end
 end

data/lib/openbill/category.rb

@@ -0,0 +1,8 @@
+module Openbill
+  class Category
+    include Virtus.model
+
+    attribute :name, String
+    attribute :accounts_count, Integer
+  end
+end

data/lib/openbill/database.rb

@@ -2,13 +2,14 @@ module Openbill
   class Database
     MAX_CONNECTIONS         = 10
 
-    def initialize(db_config)
-      @db_config = db_config
-      @db = Sequel.connect db_config, logger: logger, max_connections: MAX_CONNECTIONS
+    def initialize(config)
+      @db = Sequel.connect config, logger: logger, max_connections: MAX_CONNECTIONS
       @db.extension :pagination
       @db.extension :pg_hstore
     end
 
+    attr_reader :db
+
     delegate :logger, to: Rails
   end
 end

data/lib/openbill/migration.rb

@@ -0,0 +1,35 @@
+module Openbill::Migration
+  def up
+    openbill_up
+  end
+
+  def down
+    openbill_down
+  end
+
+  private
+
+  def openbill_up
+    Dir.entries(sql_dir).select{|f| File.file? sql_dir + f }.sort.each do |file|
+      say_with_time "Migrate with #{file}" do
+        execute File.read sql_dir + file
+      end
+    end
+  end
+
+  def openbill_down
+    execute "DROP TABLE IF EXISTS OPENBILL_ACCOUNTS CASCADE"
+    execute "DROP TABLE IF EXISTS OPENBILL_TRANSACTIONS CASCADE"
+    execute "DROP TABLE IF EXISTS OPENBILL_GOODS CASCADE"
+    execute "DROP TABLE IF EXISTS OPENBILL_GOODS_AVAILABILITIES CASCADE"
+  end
+
+  def openbill_reset
+    down
+    up
+  end
+
+  def sql_dir
+    Openbill.root + '/sql/'
+  end
+end

data/lib/openbill/service.rb

@@ -4,11 +4,27 @@ require 'money'
 module Openbill
 
   class Service
+    attr_reader :database, :config
+
     def initialize(config)
       @config = config
       @database = Openbill::Database.new config.database
     end
 
+    def categories
+      database
+        .db[ACCOUNTS_TABLE_NAME]
+        .group_and_count(:category)
+        .all
+        .map { |raw| Category.new name: raw[:category], accounts_count: raw[:count] }
+    end
+
+    # Return accounts repositiory (actualy sequel dataset)
+    #
+    def accounts
+      Openbill::Account.dataset
+    end
+
     # @param ident - ident аккаунта в виде: [:category, :key]
     #
     # @param options - опции применяемые для создания аккаунта (см create_account)
@@ -74,7 +90,6 @@ module Openbill
 
     private
 
-    attr_reader :database, :config
 
     delegate :logger, to: Rails
 

data/lib/openbill/version.rb

@@ -1,3 +1,3 @@
 module Openbill
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

data/openbill-ruby.gemspec

@@ -19,6 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "money"
+  spec.add_dependency "sequel"
+  spec.add_dependency "virtus"
+  spec.add_dependency "pg"
+
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: openbill-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Danil Pismenny
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +117,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -72,9 +129,11 @@ files:
 - lib/openbill-ruby.rb
 - lib/openbill.rb
 - lib/openbill/account.rb
+- lib/openbill/category.rb
 - lib/openbill/configuration.rb
 - lib/openbill/database.rb
 - lib/openbill/engine.rb
+- lib/openbill/migration.rb
 - lib/openbill/registry.rb
 - lib/openbill/service.rb
 - lib/openbill/transaction.rb