yinx_sql 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f703709951eaeef0cf7a2b115278102d7acea21
-  data.tar.gz: 48cc8532ab89e5a2546628213bdeab682ff2d583
+  metadata.gz: 1fc35c9b4ca3237fff11f3c1ec25ab076dd77f50
+  data.tar.gz: 5ea8718c80eda6e7c9d102d0cf4ae101fd247748
 SHA512:
-  metadata.gz: 3bb765ecea74beedabe74a1adde08bced30f3cbfb71176079091e30ffe595c8d01d2c7f0407e24f14796a3ea374c736d2235aa5a362ea76922652e13be4894f7
-  data.tar.gz: be02438d9c453e7866f8dabe1f75eefefb0ef2a9f0d56b089d5b2af4144f98d68c67f9df16bd0c939fcd845b7001e30003aaf224eb4dc2a97c44a47740ab0f12
+  metadata.gz: f6a0e458109bf921e989de7e603099839c17e0b702115cbb9fea2e05f09a7a4ce32e3b3887a3deb9abe6acdfc6ee0944f82e748518ce786a74fed13bc5050534
+  data.tar.gz: a2d16bc5730fc93ec0655537f72b8d5c2517ba80bf131b0547bd005b16184718aea556f3f5a0172d3aec46bcb7a66e8573ba5d126c5e4a83f7f6e8217fc2a86e

data/lib/yinx_sql.rb

@@ -22,22 +22,13 @@ module Yinx
 	  t.belongs_to :batch
 	end
 
-	create_table :stacks do |t|
-	  t.string :name
-	  t.belongs_to :batch
-	end
-
-	create_table :books do |t|
-	  t.string :name
-	  t.belongs_to :stack
-	  t.belongs_to :batch
-	end
-
 	create_table :notes do |t|
 	  t.string :title
+          t.string :book
+          t.string :stack
 	  t.integer :content_length
           t.timestamps
-	  t.belongs_to :book
+	  t.belongs_to :batch
 	end
 
         create_table :notes_tags do |t|
@@ -47,7 +38,7 @@ module Yinx
       end
 
       def down
-	[:notes_tags, :notes, :books, :stacks, :tags, :batches].each do |t|
+	[:notes_tags, :notes, :tags, :batches].each do |t|
 	  drop_table t
 	end
       end

data/lib/yinx_sql/batch.rb

@@ -1,6 +1,4 @@
 require 'yinx'
-require 'yinx_sql/stack'
-require 'yinx_sql/book'
 require 'yinx_sql/note'
 require 'yinx_sql/tag'
 
@@ -8,25 +6,11 @@ module Yinx
   module SQL
     class Batch < ActiveRecord::Base
       has_many :tags, dependent: :destroy
-      has_many :stacks, dependent: :destroy
-      has_many :books, dependent: :destroy
+      has_many :notes, dependent: :destroy
 
       def self.insert notes
         batch = Batch.new
 
-        stacks = Hash.new do |h, name|
-          stack = Stack.new name: name
-          batch.stacks << stack
-          h[name] = stack
-        end
-
-        books = Hash.new do |h, stack_book|
-          b = Book.new(name: stack_book[1])
-          batch.books << b
-          stacks[stack_book[0]].books << b
-          h[stack_book] = b
-        end
-
         tags = Hash.new do |h, name|
           tag = Tag.new name: name
           batch.tags << tag
@@ -35,12 +19,13 @@ module Yinx
 
         notes.each do |note|
           n = Note.new(title: note.title,
+                       book: note.book,
+                       stack: note.stack,
                        content_length: note.contentLength,
                        created_at: note.created_at,
                        updated_at: note.updated_at)
 
-          book = books[[note.stack, note.book]]
-          book.notes << n
+          batch.notes << n
 
           note.tags.each do |tag_name|
             tag = tags[tag_name]
@@ -51,6 +36,14 @@ module Yinx
         batch.save
       end
 
+      def books
+        notes.map(&:stack_book).uniq
+      end
+
+      def stacks
+        notes.map{|note| note.stack.nil? ? 'NO_STACK' : note.stack}.uniq
+      end
+
     end
   end
 end

data/lib/yinx_sql/note.rb

@@ -2,8 +2,14 @@ module Yinx
   module SQL
 
     class Note < ActiveRecord::Base
-      belongs_to :book
+      belongs_to :batch
       has_and_belongs_to_many :tags
+
+      def stack_book
+        st = stack.nil? ? '' : "#{stack}/"
+        "#{st}#{book}"
+      end
+
     end
 
   end

data/lib/yinx_sql/version.rb

@@ -1,5 +1,5 @@
 module Yinx
   module SQL
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/yinx_sql.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 
-  spec.add_dependency "yinx", "0.1.4"
+  spec.add_dependency "yinx", "~> 0.1.5"
   spec.add_dependency "activerecord", "~> 5.0.0"
   spec.add_dependency "pg", "~> 0.19.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yinx_sql
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: yinx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -111,10 +111,8 @@ files:
 - bin/setup
 - lib/yinx_sql.rb
 - lib/yinx_sql/batch.rb
-- lib/yinx_sql/book.rb
 - lib/yinx_sql/json_batch.rb
 - lib/yinx_sql/note.rb
-- lib/yinx_sql/stack.rb
 - lib/yinx_sql/tag.rb
 - lib/yinx_sql/version.rb
 - yinx_sql.gemspec

data/lib/yinx_sql/book.rb

@@ -1,11 +0,0 @@
-module Yinx
-  module SQL
-
-    class Book < ActiveRecord::Base
-      belongs_to :stack
-      belongs_to :batch
-      has_many :notes, dependent: :destroy
-    end
-
-  end
-end

data/lib/yinx_sql/stack.rb

@@ -1,10 +0,0 @@
-module Yinx
-  module SQL
-
-    class Stack < ActiveRecord::Base
-      belongs_to :batch
-      has_many :books
-    end
-
-  end
-end