jabara 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921c5db1c328803a7238637ddc12ef2b01dea0a8
-  data.tar.gz: 1c0a3f478163eb62a71f9cc2ad6b15fc4e0eef84
+  metadata.gz: 72c834799e8eb5bde01d17821d7b19336277d1dc
+  data.tar.gz: 89c64d90ca7af9db0a56acc3f6cf1b5bc2079195
 SHA512:
-  metadata.gz: 2d2b8007f5d9ecf6ddd5fce7c1ce8190bc9245a8f373e725afb8cbc4a803912554ea3747cecd254cac4d2a453168d5bf0a7b33c96b0eab9a6000cf7a436972ff
-  data.tar.gz: 5bfc494d5b8fbf10fc94039260f5d736d847da0acaada34ce867de42a820670e2e843ce71ead59c4f22f49447e315801eac97cee1a73a287d2c67a596e9c6591
+  metadata.gz: fcc4732c2f6b395c3096e10c3a4eef5ed1e882766a2d36e3e5a8a0a4c86dd284405d1e577ff6e296b3a7663b5d2605be2b7bfd5ebf4b50182ff085f56f716d2d
+  data.tar.gz: 23f9901bd17cc56ba61d8e24d89abb30661cf2c069d3b40b4bd6e712d204b3963917ce62271aa6131f5c8e9780db17d5a0d7597cde39e35e22bd6c5f7ae3f136

data/jabara.gemspec

@@ -18,7 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.0.0"
+
   spec.add_dependency "scheman", "0.0.5"
+  spec.add_dependency "yajl-ruby", "~> 1.2"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"

data/lib/jabara/converter/nest_to_flats.rb

@@ -0,0 +1,42 @@
+require 'jabara/data'
+require 'jabara/transformer/flatten'
+
+module Jabara
+  module Converter
+    class NestToFlats
+
+      # inputの[object_type]とoutputsのobject_typeが一致することを仮定
+      # ユースケースによるけど、input schemaのkeysとoutput schemaのcolummsはなるべく一致しているべき
+      def initialize(input:, output_map:, id_key_name: 'belongsTo')
+        @input = input
+        @output_map = output_map # object_typeからOutputへのマッピング
+        @tr_flatten = Jabara::Transformer::Flatten.new(id_key_name: id_key_name)
+      end
+
+      def convert(hash)
+        nested_repr = @input.decode(hash)
+        flat_repr, inner_reprs = @tr_flatten.convert(nested_repr)
+
+        write(flat_repr)
+        inner_reprs.each do |inner_repr|
+          write(inner_repr)
+        end
+      end
+
+      def terminate_all
+        @output_map.each do |_, output|
+          output.terminate
+        end
+      end
+
+      private
+      def write(repr)
+        object_type = Jabara.object_type(repr)
+        output = @output_map[object_type]
+        raise ArgumentError, 'output plugin for %s is not registered' % object_type if output.nil?
+        output.write(repr)
+      end
+    end
+  end
+end
+

data/lib/jabara/mysql/schema.rb

@@ -131,7 +131,7 @@ module Jabara
         end
 
         def self.build(&block)
-          this = Builder.new
+          this = self.new
           this.instance_eval(&block)
           return this.schema
         end
@@ -192,7 +192,7 @@ module Jabara
         private 
 
         def self.stmt_to_schema(create_stmt_hash)
-          this = Builder.new
+          this = self.new
           this.schema.table_name = create_stmt_hash[:name]
           create_stmt_hash[:fields].each do |field_hash|
             field_hash = field_hash[:field]

data/lib/jabara/mysql_bulk/output.rb

@@ -8,13 +8,13 @@ module Jabara
         @table_name = schema.table_name
         @schema = schema
         @tuple_size = tuple_size
+        @column_keys = @schema.columns.map { |column| column[:key] }
         reset_buffer
       end
 
       def encode(repr)
         data = ::Jabara.data(repr)
-        tuple_str = "(%s)" % @schema.columns.map { |column| 
-          key = column[:key]
+        tuple_str = "(%s)" % @column_keys.map { |key| 
           mysql_value(data[key])
         }.join(", ")
 

data/lib/jabara/mysql_dump/output.rb

@@ -0,0 +1,70 @@
+require 'jabara/data'
+
+module Jabara
+  module MySQLDump
+    class Output < Jabara::MySQL::Output
+
+      def initialize(schema:, out_path:,
+                     fields_terminated_by:',',
+                     fields_enclosed_by:'"', # TODO Not supported yet
+                     fields_escapted_by:'"', # TODO Not supported yet
+                     lines_terminated_by:"\n")
+        @schema = schema
+        @out_path = out_path
+
+        @field_delimiter = fields_terminated_by
+        @field_quote_str = fields_enclosed_by
+        @escape_str = fields_escapted_by
+        @line_delimiter = lines_terminated_by
+
+        @column_keys = @schema.columns.map { |column| column[:key] }
+        @file = File.open(@out_path, 'w')
+        @buf = ''
+      end
+
+      def write(object_repr)
+        begin
+          @file.write(@buf)
+          data = ::Jabara.data(object_repr)
+          @buf = @column_keys.map { |key|
+            mysql_value(data[key])
+          }.join(@field_delimiter) + @line_delimiter
+        rescue => e
+          cleanup
+          raise e # reraise
+        end
+      end
+
+      def terminate
+        @file.write(@buf.chomp(@line_delimiter))
+        @file.close
+      end
+
+      def load_data_query
+        query = <<SQL
+load data infile '%s' into `%s`
+character set %s
+fields terminated by '%s'
+       enclosed by '%s'
+       escaped by '%s'
+lines terminated by '%s'
+;
+SQL
+        query % [@out_path,
+                 @schema.table_name,
+                 @char_set || 'utf8mb4',
+                 @field_delimiter,
+                 @field_quote_str,
+                 @escape_str,
+                 @line_delimiter]
+      end
+
+      private
+      def cleanup
+        @file.close
+        File.delete(@out_path)
+      end
+
+    end
+  end
+end

data/lib/jabara/mysql_dump.rb

@@ -0,0 +1 @@
+require 'jabara/mysql_dump/output'

data/lib/jabara/parse_com/schema.rb

@@ -86,9 +86,9 @@ module Jabara
       end
 
       class String
-        def initialize(max: 1000, default: nil) # default = nil の場合はnullを許容する
+        def initialize(max: nil, default: nil) # default = nil の場合はnullを許容する
           raise TypeError, 'default must be string' unless default.is_a? ::String or default.nil?
-          raise TypeError, 'max must be integer' unless max.is_a? ::Integer
+          raise TypeError, 'max must be integer' unless max.is_a? ::Integer or max.nil?
           @max = max
           @default = default
         end
@@ -97,7 +97,8 @@ module Jabara
           return ::Jabara.null if data.nil? and @default.nil?
           return @default if data.nil?
           raise TypeError, 'data must be string' unless data.is_a? ::String or default.nil?
-          ::Jabara.primitive(:string, data.slice(0, @max))
+          data = data.slice(0, @max) unless @max.nil?
+          ::Jabara.primitive(:string, data)
         end
       end
 
@@ -111,7 +112,7 @@ module Jabara
 
       class Boolean
         def initialize(default: nil) # default = nil の場合はnullを許容する
-          raise ArgumentError, 'default must be true of false' unless [true, false].include? default
+          raise ArgumentError, 'default must be true of false' unless [true, false].include? default or default.nil?
           @default = default
         end
 
@@ -159,6 +160,41 @@ module Jabara
         end
       end
 
+      class JSONString
+        def initialize
+          @encoder = Yajl::Encoder.new
+        end
+        def parse(data)
+          return ::Jabara.null if data.nil?
+          raise ArgumentError, 'data must be hash or array' unless data.is_a? ::Hash or data.is_a? ::Array
+
+          json_str = @encoder.encode(data)
+          ::Jabara.primitive(:string, json_str)
+        end
+      end
+
+      class Variants
+        def initialize(&block)
+          @variants = {}
+          instance_eval(&block)
+        end
+        def parse(data)
+          return ::Jabara.null if data.nil?
+          raise ArgumentError, 'data must be hash' unless data.is_a? ::Hash
+
+          reprs = @variants.map { |key, schema|
+            if not data[key].nil? then schema.decode(data[key]) else nil end
+          }.compact
+          ::Jabara.set(reprs)
+        end
+
+        # following methods are for DSL
+
+        def variant(key:, schema:)
+          @variants[key] = ::Jabara::ParseCom::Input.new(schema)
+        end
+      end
+
       class Schema
 
         attr_accessor :key_defs, :object_type, :id_key_name
@@ -169,6 +205,13 @@ module Jabara
           @id_key_name = nil
         end
 
+        #def object_types
+        #  @key_defs.map { |key_string, schema|
+        #    return [] unless schema.is_a? Jabara::ParseCom::Schema::Object
+        #    schema.object_types # TODO impl it
+        #  }.flatten
+        #end
+
       end
 
       class Builder
@@ -176,10 +219,18 @@ module Jabara
         attr_reader :schema
 
         def self.build(&block)
-          this = Builder.new
+          this = self.new
           this.instance_eval(&block)
           return this.schema
         end
+ 
+        def self.relation object_type
+          self.build do
+            type object_type
+            key 'owningId',  string
+            key 'relatedId', string
+          end
+        end
 
         def initialize
           @schema = Schema.new
@@ -201,6 +252,10 @@ module Jabara
           raise ArgumentError, 'key_name must be string' unless key_string.is_a? ::String
           (@schema.key_defs)[key_string] = type
         end
+
+        def schema(&block)
+          self.build(&block)
+        end
         
         # TODO
         #def object
@@ -236,7 +291,7 @@ module Jabara
           DateTime.new default: default
         end
 
-        def string max: 1000, default: nil
+        def string max: nil, default: nil
           String.new max: max, default: default
         end
 
@@ -251,6 +306,14 @@ module Jabara
         def acl user_acl_object_type: ,role_acl_object_type:
           ACL.new(user_acl_object_type: user_acl_object_type, role_acl_object_type: role_acl_object_type)
         end
+
+        def json_string
+          JSONString.new
+        end
+
+        def variants(&block)
+          Variants.new(&block)
+        end
       end
     end
   end

data/lib/jabara/version.rb

@@ -1,3 +1,3 @@
 module Jabara
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jabara
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuki Takeichi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scheman
@@ -24,6 +24,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,12 +97,15 @@ files:
 - bin/jabara
 - jabara.gemspec
 - lib/jabara.rb
+- lib/jabara/converter/nest_to_flats.rb
 - lib/jabara/data.rb
 - lib/jabara/mysql.rb
 - lib/jabara/mysql/output.rb
 - lib/jabara/mysql/schema.rb
 - lib/jabara/mysql_bulk.rb
 - lib/jabara/mysql_bulk/output.rb
+- lib/jabara/mysql_dump.rb
+- lib/jabara/mysql_dump/output.rb
 - lib/jabara/parse_com.rb
 - lib/jabara/parse_com/input.rb
 - lib/jabara/parse_com/schema.rb
@@ -110,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="