jabara 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c834799e8eb5bde01d17821d7b19336277d1dc
-  data.tar.gz: 89c64d90ca7af9db0a56acc3f6cf1b5bc2079195
+  metadata.gz: 3b2850cefe7e9de9a35df28e4623210b1e39fcac
+  data.tar.gz: 5c3e780facc6bd90876d9fc0835ad07279afb837
 SHA512:
-  metadata.gz: fcc4732c2f6b395c3096e10c3a4eef5ed1e882766a2d36e3e5a8a0a4c86dd284405d1e577ff6e296b3a7663b5d2605be2b7bfd5ebf4b50182ff085f56f716d2d
-  data.tar.gz: 23f9901bd17cc56ba61d8e24d89abb30661cf2c069d3b40b4bd6e712d204b3963917ce62271aa6131f5c8e9780db17d5a0d7597cde39e35e22bd6c5f7ae3f136
+  metadata.gz: 62ac4c1acf8e8f3647ee395cbf5eec5497ecc731d6025f0ca4eccf2f987acec8cc10c975a6eb7e74eef510645ecf2933a601105c82a4d65a6055473f6d34a23c
+  data.tar.gz: 272e9bdbf60de4a031032f92210147488422942b4181e7fd00169768e9398a2e9c6fb6d57a6c066f657fbe77bf02b95547eb7e3c630149e0f89b098cbb44569b

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+*.gem

data/jabara.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_dependency "scheman", "0.0.5"
-  spec.add_dependency "yajl-ruby", "~> 1.2"
+  spec.add_dependency 'multi_json', '~> 1.0'
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"

data/lib/jabara/mysql/output.rb

@@ -4,7 +4,8 @@ module Jabara
   module MySQL
     class Output
 
-      def initialize
+      def initialize(null_value:'null')
+        @null_value = null_value
       end
 
       def encode(object_repr)
@@ -30,7 +31,7 @@ module Jabara
         tag = ::Jabara.tag(repr)
         case tag
         when :null
-          'null'
+          @null_value
         when :integer
           data
         when :float
@@ -40,7 +41,7 @@ module Jabara
         when :string
           quote(data)
         when :boolean
-          data
+          if data == true then '1' else '0' end
         when :object, :array
           raise ArgumentError, "Can't accept nested object or array!"
         else

data/lib/jabara/mysql_dump/output.rb

@@ -1,4 +1,5 @@
 require 'jabara/data'
+require 'jabara/mysql/output'
 
 module Jabara
   module MySQLDump
@@ -20,6 +21,8 @@ module Jabara
         @column_keys = @schema.columns.map { |column| column[:key] }
         @file = File.open(@out_path, 'w')
         @buf = ''
+
+        super(null_value:'\N')
       end
 
       def write(object_repr)
@@ -27,7 +30,12 @@ module Jabara
           @file.write(@buf)
           data = ::Jabara.data(object_repr)
           @buf = @column_keys.map { |key|
-            mysql_value(data[key])
+
+            begin
+              mysql_value(data[key])
+            rescue => e
+              raise e.class, e.message + ' (for key: %s)' % key # TODO e.message is bad
+            end
           }.join(@field_delimiter) + @line_delimiter
         rescue => e
           cleanup

data/lib/jabara/parse_com/input.rb

@@ -3,6 +3,7 @@ require 'jabara/data'
 module Jabara
   module ParseCom
     class Input
+      attr_reader :schema
       def initialize(parse_com_schema)
         @schema = parse_com_schema
       end

data/lib/jabara/parse_com/schema.rb

@@ -2,6 +2,7 @@ require 'jabara/data'
 require 'jabara/transformer/key_value'
 
 require 'date'
+require 'multi_json'
 
 module Jabara
   module ParseCom
@@ -21,14 +22,20 @@ module Jabara
       #  end
       #end
 
-      class TimeStamp # Parseが自動生成するカラム (createdAt, updatedAt)
+      class PrimitiveParser
+        def object_types
+          []
+        end
+      end
+
+      class TimeStamp < PrimitiveParser # Parseが自動生成するカラム (createdAt, updatedAt)
         def parse(data)
           datetime = ::DateTime.iso8601(data)
           ::Jabara.primitive(:datetime, datetime)
         end
       end
 
-      class Integer
+      class Integer < PrimitiveParser
         def initialize(default: nil) # default = nil の場合はnullを許容する
           raise TypeError, 'default must be integer' unless default.is_a? ::Integer or default.nil?
           @default = default
@@ -38,14 +45,14 @@ module Jabara
           return ::Jabara.null if data.nil? and @default.nil?
           return ::Jabara.primitive(:integer, @default) if data.nil?
 
-          raise TypeError, 'default must be integer' unless data.is_a? ::Integer
+          raise TypeError, 'data must be integer' unless data.is_a? ::Integer
           ::Jabara.primitive(:integer, data)
         end
       end
 
-      class Float
+      class Float < PrimitiveParser
         def initialize(default: nil) # default = nil の場合はnullを許容する
-          raise TypeError, 'default must be integer' unless default.is_a? ::Float or default.nil?
+          raise TypeError, 'default must be float' unless default.is_a? ::Float or default.nil?
           @default = default
         end
 
@@ -53,18 +60,18 @@ module Jabara
           return ::Jabara.null if data.nil? and @default.nil?
           return ::Jabara.primitive(:float, @default) if data.nil?
 
-          raise TypeError, 'default must be float' unless data.is_a? ::Float
+          raise TypeError, 'data must be float' unless data.is_a? ::Float
           ::Jabara.primitive(:float, data)
         end
       end
 
-      class ObjectId
+      class ObjectId < PrimitiveParser
         def parse(data)
           ::Jabara.primitive(:string, data)
         end
       end
 
-      class File
+      class File < PrimitiveParser
         def parse(data)
           return ::Jabara.null if data.nil?
           raise ArgumentError, 'File object is collapsed' if data['url'].nil?
@@ -72,7 +79,7 @@ module Jabara
         end
       end
 
-      class DateTime
+      class DateTime < PrimitiveParser
         def initialize(default: nil) # default = nil の場合はnullを許容する
           raise TypeError, 'default must be datetime' unless default.is_a? ::DateTime or default.nil?
           @default = default
@@ -85,7 +92,7 @@ module Jabara
         end
       end
 
-      class String
+      class String < PrimitiveParser
         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 or max.nil?
@@ -102,7 +109,7 @@ module Jabara
         end
       end
 
-      class Pointer
+      class Pointer < PrimitiveParser
         def parse(data)
           return ::Jabara.null if data.nil?
           raise ArgumentError, 'pointer object is collapsed' if data['objectId'].nil?
@@ -110,7 +117,7 @@ module Jabara
         end
       end
 
-      class Boolean
+      class Boolean < PrimitiveParser
         def initialize(default: nil) # default = nil の場合はnullを許容する
           raise ArgumentError, 'default must be true of false' unless [true, false].include? default or default.nil?
           @default = default
@@ -143,6 +150,10 @@ module Jabara
           return ::Jabara.set(elems)
         end
 
+        def object_types
+          [@user_acl_object_type, @role_acl_object_type]
+        end
+
         def decode_acl_user_entry(user_object_id, acl_permission)
           data = {}
           data['userObjectId'] = ::Jabara.primitive(:string, user_object_id)
@@ -160,15 +171,12 @@ module Jabara
         end
       end
 
-      class JSONString
-        def initialize
-          @encoder = Yajl::Encoder.new
-        end
+      class JSONString < PrimitiveParser
         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)
+          json_str = MultiJson.dump(data)
           ::Jabara.primitive(:string, json_str)
         end
       end
@@ -178,6 +186,7 @@ module Jabara
           @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
@@ -188,11 +197,21 @@ module Jabara
           ::Jabara.set(reprs)
         end
 
+        def object_types
+          @variants.map { |_, input|
+            [input.schema.object_type] + input.schema.inner_object_types
+          }.flatten
+        end
+
         # following methods are for DSL
 
         def variant(key:, schema:)
           @variants[key] = ::Jabara::ParseCom::Input.new(schema)
         end
+
+        def schema(&block)
+          Builder.build(&block)
+        end
       end
 
       class Schema
@@ -205,12 +224,11 @@ 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
+        def inner_object_types
+          @key_defs.map { |key_string, schema|
+            schema.object_types
+          }.flatten
+        end
 
       end
 
@@ -253,10 +271,6 @@ module Jabara
           (@schema.key_defs)[key_string] = type
         end
 
-        def schema(&block)
-          self.build(&block)
-        end
-        
         # TODO
         #def object
         #  Object.new

data/lib/jabara/version.rb

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

data/test/test_parse_com.rb

@@ -0,0 +1,32 @@
+require 'minitest_helper'
+
+require 'jabara/parse_com'
+
+module ParseComTest
+  class TestBuilder < MiniTest::Test
+    def test_inner_object_types
+      schema = Jabara::ParseCom::Schema::Builder.build do
+        type 'test'
+        id 'objectId'
+        key 'objectId', parse_object_id
+        key 'createdAt', timestamp
+        key 'statusType', integer
+        key 'width', float
+        key 'image', file
+        key 'ownerId', pointer
+        key 'activated', boolean
+        key 'metadata', json_string
+        key 'options', variants {
+          variant key: 'collabo', schema: schema {
+            type 'collabo'
+            key 'hoge', string
+          }
+        }
+        key 'ACL', acl(user_acl_object_type: 'useracl', role_acl_object_type: 'roleacl')
+      end
+
+      assert schema.object_type == 'test'
+      assert schema.inner_object_types == ['collabo', 'useracl', 'roleacl']
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jabara
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Yuki Takeichi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scheman
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,7 @@ files:
 - lib/jabara/version.rb
 - test/minitest_helper.rb
 - test/test_jabara.rb
+- test/test_parse_com.rb
 homepage: https://github.com/yuki-takeichi/jabara
 licenses:
 - MIT
@@ -142,3 +143,4 @@ summary: A gem for pluggable data transformation.
 test_files:
 - test/minitest_helper.rb
 - test/test_jabara.rb
+- test/test_parse_com.rb