ruson 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3b5eacde447ed93d7ecffd81ba095d20dad1398687f5138dd7f2267bfd5bacf
-  data.tar.gz: 172098d6792639c7c785eba55332b323785c879ce59458766d60787458b043bc
+  metadata.gz: ca2fa65cff2663ee3a6081d16d29f707ac59a972024488ca8036d500d071c5aa
+  data.tar.gz: 5c5286b425b029c7e667f7909f32b60b0eac76d46cc028692a386e8378db4d7c
 SHA512:
-  metadata.gz: 1e33b1b04e784cc26494d08fb02a26c9afa9f42bd3595c6f4527da6f59ce937c8df8b4d4b8d95bf528d6ecdbc9384cddc80de738b59d5224098fd9c4c45da3da
-  data.tar.gz: 5cb1a2daa61f905266afb804878a59a0f617e19d530649651c2fbd978c9854c87c243d1002c7baa4e11bc95b6590e75207f4a2af5942941444d378693cbec1f2
+  metadata.gz: b9066c6c2df513dbed5d260d1c15b880c1bd707241d195211c583bf4cab245c4dcaef76c0f1cec72dfb50da8359a71edabcf9fbcf608c6bcf3909119672e26e6
+  data.tar.gz: c5b71fa2d7385b882f57a52b2124c99b004d82c45fd464d61bce1fe574d26cfd517e65c61195956de4694f36da14001148ac66aad307f9d42d487923d3bb02bd

data/README.md

@@ -123,34 +123,42 @@ post.picture.url #=> 'http://sample.com/picture.png'
 
 ###### Primary classes
 
+* Array
 * Boolean
-* Integer
 * Float
+* Integer
+* Time
 
 
 post.json
 ```json
 {
   "title": "Ruson",
+  "items": ["orange", "apple"],
   "is_new": "true",
+  "rate": "3.8",
   "view": "1234",
-  "rate": "3.8"
+  "expired_at": 1575608299
 }
 ```
 
 ```ruby
 class Post < Ruson::Base
   field :title
+  field :items, class: Array
   field :is_new, class: Boolean
-  field :view, class: Integer
   field :rate, class: Float
+  field :view, class: Integer
+  field :expired_at, class: Time
 end
 
 json = File.read('post.json')
 post = Post.new(json)
+post.items #=> ["orange", "apple"]
 post.is_new #=> true
-post.view #=> 1234
 post.rate #=> 3.8
+post.view #=> 1234
+post.expired_at #=> 2019-12-06 04:58:19 +0000
 ```
 
 ##### each class
@@ -337,7 +345,21 @@ Ruson.output_folder = './db/'
 #### Find a record by ID
 
 ```ruby
-user = User.find(1) # Searches for a ./db/Users/1.json file
+User.find(1) # Searches for a ./db/Users/1.json file
+
+# Searching a user which doesn't exist
+User.find(1234) #=> nil
+User.find!(1234) #=> raises Ruson::RecordNotFound
+```
+
+#### Find first record
+
+```ruby
+User.first # Loads the first ./db/Users/*.json file.
+
+# Without existing User records
+User.first #=> nil
+User.first! #=> raises Ruson::RecordNotFound
 ```
 
 ## Development

data/lib/ruson/base.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'active_support'
 require 'active_support/core_ext'
 
+require 'ruson/class/array'
 require 'ruson/class/boolean'
 require 'ruson/class/float'
 require 'ruson/class/integer'
@@ -58,6 +59,7 @@ module Ruson
       end
     end
 
+    # ~~~~ Mixins ~~~~
     include Ruson::Converter
     include Ruson::Json
     include Ruson::Nilable
@@ -65,6 +67,15 @@ module Ruson
     include Ruson::Querying
     include Ruson::Value
 
+    # ~~~~ Class Methods ~~~~
+    def self.ensure_output_folder_is_defined
+      return if Ruson.output_folder
+
+      raise ArgumentError, 'No output folder defined. You can define it ' \
+                           'using Ruson.output_folder = "/path/to/db/folder"'
+    end
+
+    # ~~~~ Instance Methods ~~~~
     def initialize(json, root_key: nil)
       params = get_hash_from_json(json)
       params = params[root_key.to_s] unless root_key.nil?
@@ -77,8 +88,9 @@ module Ruson
 
       res.inject({}) do |result, attributes|
         key, value = attributes
-        if self.class.accessors[key] && self.class.accessors[key].key?(:name)
-          result[self.class.accessors[key][:name].to_s] = value
+        accessor = self.class.accessors[key]
+        if accessor && accessor&.key?(:name)
+          result[accessor[:name]] = value
         else
           result[key] = value
         end
@@ -86,30 +98,38 @@ module Ruson
       end
     end
 
-    def to_json
-      to_hash.to_json
+    def to_json(options = {})
+      hash = to_hash
+
+      options[:exclude].each { |key| hash.delete(key) } if options[:exclude]
+
+      hash.to_json
     end
 
     private
 
+    def cast_value(value, accessor_options, options = {})
+      check_nilable(value, accessor_options)
+      get_val(value, accessor_options)
+    end
+
     def init_attributes(accessors, params)
       update_attributes(accessors, params)
 
       self.class.attr_accessor(:id)
-      set_attribute(:id, params[:id]) if params[:id]
+      set_attribute(:id, params[:id]) if params && params[:id]
     end
 
-    def set_attribute(attr_name, val)
-      self.send("#{attr_name}=".to_sym, val)
+    def set_attribute(attr_name, value)
+      send("#{attr_name}=".to_sym, value)
     end
 
     def update_attributes(accessors, params)
       accessors.each do |key, options|
-        value = params[options[:name]] || params[key]
+        value = params[options[:name]] || params[key] if params
 
-        check_nilable(value, options)
-        val = get_val(value, options)
-        set_attribute(key, val)
+        casted_value = cast_value(value, options)
+        set_attribute(key, casted_value)
       end
     end
   end

data/lib/ruson/class/array.rb

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

data/lib/ruson/json.rb

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

data/lib/ruson/persistence.rb

@@ -25,13 +25,6 @@ module Ruson
       true
     end
 
-    def ensure_output_folder_is_defined
-      return if Ruson.output_folder
-
-      raise ArgumentError, 'No output folder defined. You can define it ' \
-                           'using Ruson.output_folder = "/path/to/db/folder"'
-    end
-
     def ensure_model_folder_exists
       return if File.exist?(self.class.model_base_path)
 
@@ -60,12 +53,12 @@ module Ruson
 
     def write_file_to_disk
       File.open(model_path, 'w') do |file|
-        file.write(to_json)
+        file.write(to_json(exclude: %i[id]))
       end
     end
 
     def save
-      ensure_output_folder_is_defined
+      self.class.ensure_output_folder_is_defined
       generate_uniq_id
       write_file_to_disk
       true

data/lib/ruson/querying.rb

@@ -6,14 +6,13 @@ module Ruson
 
     module ClassMethods
       def find(id)
+        ensure_output_folder_is_defined
+
         file_path = File.join(model_base_path, "#{id}.json")
 
         return unless File.exist?(file_path)
 
-        json = JSON.parse(File.read(file_path))
-        json[:id] = id
-
-        new json
+        load(file_path, id: id)
       end
 
       def find!(id)
@@ -23,6 +22,34 @@ module Ruson
 
         record
       end
+
+      def first
+        ensure_output_folder_is_defined
+
+        file_path = Dir.glob(File.join(model_base_path, '*.json')).first
+
+        return unless file_path
+
+        id = File.basename(file_path, '.json').to_i
+
+        load(file_path, id: id)
+      end
+
+      def first!
+        record = first
+
+        raise Ruson::RecordNotFound unless record
+
+        record
+      end
+
+      def load(file_path, extra_json = {})
+        json = JSON.parse(File.read(file_path))
+
+        json.merge!(extra_json) if extra_json
+
+        new json
+      end
     end
   end
 end

data/lib/ruson/value.rb

@@ -13,7 +13,6 @@ module Ruson
     private
 
     def class_param(param, klass)
-      return nil if param.nil?
       klass.new(param)
     end
 

data/lib/ruson/version.rb

@@ -1,3 +1,3 @@
 module Ruson
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruson
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - klriutsa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,6 +114,7 @@ files:
 - bin/setup
 - lib/ruson.rb
 - lib/ruson/base.rb
+- lib/ruson/class/array.rb
 - lib/ruson/class/boolean.rb
 - lib/ruson/class/float.rb
 - lib/ruson/class/integer.rb