ruson 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51918f002d66ba2ffcf4e7e06c4a3b0e31892426ae3fa61df9671a68322cec73
-  data.tar.gz: 7c49ce59c40f75e62989ce794b84d009018fd7c6402c046a86208ce27fbc2ae1
+  metadata.gz: 39dd7c6ce4a45497f8925a29bd35bc4cead7c1a7de5b540f82ac3792be969305
+  data.tar.gz: ddd14dd0b2f08c7f2fc2a6502908234411ae6a28e0eb6d222f5736d9668411bb
 SHA512:
-  metadata.gz: a2adab4f47a5c93f73c96151da9a072aed2fc835c359ac49e1f7d2a97dd9ff46898da2c3ece5374af1a139212352f4b37edec74e9fe0e73853ca36b2f760eac8
-  data.tar.gz: fe318ac05c022af0885cc3ea1d52238db8af0672638cfb8f121d9250054796fd81482f6bdacc7884abbf0d43c03310f0b002f18a4f95200148bf0991c947dc97
+  metadata.gz: b908373f13bca616112e8bc1ef73d237cd1a44aa06102e9c4b7309befb2358530ea6622688a088f1293b63eb387798561bc9363453d7962b01b4df67169b3644
+  data.tar.gz: cb648ad162cbfbc5a25d3814ec686d116ddcfed0e75c59e7137cf5492b13bbfae8e940842c25c8bf075b9674d038a7cbfeab058bd350efc05ef755aa5a53d0f4

data/README.md

@@ -99,6 +99,38 @@ post = Post.new(json)
 post.picture.url #=> 'http://sample.com/picture.png'
 ```
 
+##### Primary classes
+
+* Boolean
+* Integer
+* Float
+
+
+post.json
+```json
+{
+  "title": "Ruson",
+  "is_new": "true",
+  "view": "1234",
+  "rate": "3.8"
+}
+```
+
+```ruby
+class Post < Ruson::Base
+  field :title
+  field :is_new, class: Boolean
+  field :view, class: Integer
+  field :rate, class: Float
+end
+
+json = File.read('post.json')
+post = Post.new(json)
+post.is_new #=> true
+post.view #=> 1234
+post.rate #=> 3.8
+```
+
 #### each class
 
 post.json

data/lib/ruson/base.rb

@@ -2,6 +2,14 @@ require 'json'
 require 'active_support'
 require 'active_support/core_ext'
 
+require 'ruson/class/boolean'
+require 'ruson/class/integer'
+require 'ruson/class/float'
+
+require 'ruson/converter'
+require 'ruson/json'
+require 'ruson/value'
+
 module Ruson
   class Base
     class << self
@@ -42,22 +50,19 @@ module Ruson
       end
     end
 
+    include Ruson::Converter
+    include Ruson::Json
+    include Ruson::Value
+
     def initialize(json, root_key: nil)
-      params = convert(json)
+      params = get_hash_from_json(json)
       params = params[root_key.to_s] unless root_key.nil?
 
-      self.class.accessors.each do |key, options|
-        val = get_val(params, options[:name] || key, options)
-        set_attribute(key, val)
-      end
+      init_attributes(self.class.accessors, params)
     end
 
     def to_hash
-      self.class.accessors.keys.inject({}) do |result, key|
-        value = send(key)
-        result[key.to_sym] = convert_array_to_hash_value(value)
-        result
-      end
+      convert_to_hash(self.class.accessors)
     end
 
     def to_json
@@ -66,53 +71,15 @@ module Ruson
 
     private
 
-    def set_attribute(attr_name, val)
-      self.send("#{attr_name}=".to_sym, val)
-    end
-
-    def get_val(params, key_name, options)
-      if !options[:class].nil?
-        class_param(params[key_name], options[:class])
-      elsif !options[:each_class].nil?
-        each_class_param(params[key_name], options[:each_class])
-      else
-        params[key_name]
-      end
-    end
-
-    def class_param(param, klass)
-      return nil if param.nil?
-      klass.new(param)
-    end
-
-    def each_class_param(params, klass)
-      return nil if params.nil?
-      params.inject([]) do |result, param|
-        result << class_param(param, klass)
-        result
+    def init_attributes(accessors, params)
+      accessors.each do |key, options|
+        val = get_val(params, options[:name] || key, options)
+        set_attribute(key, val)
       end
     end
 
-    def convert(json)
-      return json if json.class == ActiveSupport::HashWithIndifferentAccess
-      (json.class == Hash ? json : JSON.parse(json)).with_indifferent_access
-    end
-
-    def ruson_class?(value)
-      value.class < Ruson::Base
-    end
-
-    def convert_ruson_to_hash_value(value)
-      return value.to_hash if ruson_class?(value)
-      value
-    end
-
-    def convert_array_to_hash_value(value)
-      if value.instance_of?(Array)
-        value.inject([]) { |result, v| result << convert_ruson_to_hash_value(v) }
-      else
-        convert_ruson_to_hash_value(value)
-      end
+    def set_attribute(attr_name, val)
+      self.send("#{attr_name}=".to_sym, val)
     end
   end
 end

data/lib/ruson/class/boolean.rb

@@ -0,0 +1,14 @@
+class Boolean
+  def self.new(value)
+    return value if value.kind_of?(TrueClass) || value.kind_of?(FalseClass)
+
+    case value
+    when 'true'
+      return true
+    when 'false'
+      return false
+    else
+      return false
+    end
+  end
+end

data/lib/ruson/class/float.rb

@@ -0,0 +1,5 @@
+class Float
+  def self.new(value)
+    value.to_f
+  end
+end

data/lib/ruson/class/integer.rb

@@ -0,0 +1,5 @@
+class Integer
+  def self.new(value)
+    value.to_i
+  end
+end

data/lib/ruson/converter.rb

@@ -0,0 +1,30 @@
+module Ruson
+  module Converter
+    def convert_to_hash(accessors)
+      accessors.keys.inject({}) do |result, key|
+        value = send(key)
+        result[key.to_sym] = convert_array_to_hash_value(value)
+        result
+      end
+    end
+
+    private
+
+    def convert_array_to_hash_value(value)
+      if value.instance_of?(Array)
+        value.inject([]) { |result, v| result << convert_ruson_to_hash_value(v) }
+      else
+        convert_ruson_to_hash_value(value)
+      end
+    end
+
+    def convert_ruson_to_hash_value(value)
+      return value.to_hash if ruson_class?(value)
+      value
+    end
+
+    def ruson_class?(value)
+      value.class < Ruson::Base
+    end
+  end
+end

data/lib/ruson/json.rb

@@ -0,0 +1,8 @@
+module Ruson
+  module Json
+    def get_hash_from_json(json)
+      return json if json.class == ActiveSupport::HashWithIndifferentAccess
+      (json.class == Hash ? json : JSON.parse(json)).with_indifferent_access
+    end
+  end
+end

data/lib/ruson/value.rb

@@ -0,0 +1,28 @@
+module Ruson
+  module Value
+    def get_val(params, key_name, options)
+      if !options[:class].nil?
+        class_param(params[key_name], options[:class])
+      elsif !options[:each_class].nil?
+        each_class_param(params[key_name], options[:each_class])
+      else
+        params[key_name]
+      end
+    end
+
+    private
+
+    def class_param(param, klass)
+      return nil if param.nil?
+      klass.new(param)
+    end
+
+    def each_class_param(params, klass)
+      return nil if params.nil?
+      params.inject([]) do |result, param|
+        result << class_param(param, klass)
+        result
+      end
+    end
+  end
+end

data/lib/ruson/version.rb

@@ -1,3 +1,3 @@
 module Ruson
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruson
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - klriutsa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,12 @@ files:
 - bin/setup
 - lib/ruson.rb
 - lib/ruson/base.rb
+- lib/ruson/class/boolean.rb
+- lib/ruson/class/float.rb
+- lib/ruson/class/integer.rb
+- lib/ruson/converter.rb
+- lib/ruson/json.rb
+- lib/ruson/value.rb
 - lib/ruson/version.rb
 - ruson.gemspec
 homepage: https://github.com/klriutsa/ruson