fson 0.0.11 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae2acd60f2606d5013fc3cbd7ae728a1052aa782
-  data.tar.gz: a8d364a84ba246aca70399c8a054a7c8bd7f0817
+  metadata.gz: 15d93512d2c5ad431642446ccb1a97a58c826a6e
+  data.tar.gz: 668890d610dd29e9198abf1a08ad4029c8f4ede9
 SHA512:
-  metadata.gz: 90ed4795d896d061d09553e09f13c09ae6dbe259d598a8ef7ed7cea680db38fcafaab0a45c1b36f7a3c39e2ca6b6fd297238323f4cc88e2305ca579b09a90d5b
-  data.tar.gz: 8eac147e359441f279957754a31cda214574642a47aa4e47a060a4acfa3d376be6317fd13421b560debd80a0321daf07428b0142a89ca8a77a84ef1617f38724
+  metadata.gz: e0d1921160f240aabeb0de4384012872bc2d13c413988307723a76d63367f5a59e23870ea9d62b3621497f9c5e18c54cf5eb835b43f2783264fb0eec83dd77bf
+  data.tar.gz: de5a76ed2782982be1d7b3795ff0acf8bbebc32c9c5db83a6c4d0481c202358496a198aa5bb6aac02daa0e1678424fdc70e4897b8b894f1650c2c8b3464835a6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fson (0.0.11)
+    fson (1.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -11,7 +11,7 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     json (1.8.3)
-    oj (2.12.10)
+    oj (2.12.11)
     rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)

data/README.md

@@ -39,10 +39,22 @@ Fson::Response.error                # {"status": "error"}
 Fson::Response.fail                 # {"status": "fail"}
 ```
     
-then add some data by passing hash
+then add some data explicitly 
 
 ```ruby
-.data([{:id => 12}])                  
+.data_array([{:id => 12}])                  
+```
+
+```json
+{
+    "data": [{
+          "id": 12
+     }]
+}
+```
+
+```ruby
+.data_hash({:id => 12})
 ```
 
 ```json
@@ -52,15 +64,30 @@ then add some data by passing hash
      }
 }
 ```
+
     
-or defining block
+or by defining block
 
 ```ruby
-.data { |data|
+.data_array { |data|
     data << {:id => 12}
 }                                   
 ```
 
+```json
+{
+    "data": [{
+        "id": 12
+    }]
+}
+```
+
+```ruby
+.data_hash { |data|
+    data[:id] => 12
+}                                   
+```
+
 ```json
 {
     "data": {
@@ -102,7 +129,7 @@ and finally get JSON with
 Builder chain
 
 ```ruby
-Fson::Response.fail.data {|data| data << {:id => 12}}.add_error('not authorized').as_json
+Fson::Response.fail.data_array {|data| data << {:id => 12}}.add_error('not authorized').as_json
 ```
     
 will return
@@ -142,6 +169,7 @@ _response                   # returns response hash
 _errors                     # returns errors hash
 _data                       # returns data hash
 _initialized_data_array     # returns existing data array or initializes it with empty array
+_initialized_data_hash      # returns existing data hash or initializes it with empty hash
 ```
 
 For example you can add builder
@@ -163,7 +191,9 @@ by registering it in initializer
 ```ruby
 require 'fson/loader'
 
-::Fson::Loader::configure([MyCustomBuilder])
+ActionDispatch::Callbacks.to_prepare do
+  ::Fson::Loader::configure([MyCustomBuilder])
+end
 ```
     
 ## Contributing

data/lib/fson/builder.rb

@@ -5,15 +5,12 @@ module Fson
     # Builder Methods
     ##
 
-    def data(data = nil, &block)
-      _initialized_data_array
-
-      if data and data.is_a?(Array)
-        @_data = data
-      end
+    def data_hash(data = nil, &block)
+      data(data, Hash, &block)
+    end
 
-      yield(_initialized_data_array()) if block_given?
-      self
+    def data_array(data = nil, &block)
+      data(data, Array, &block)
     end
 
     def status(status)
@@ -52,6 +49,18 @@ module Fson
 
     private
 
+    def data(data = nil, type = nil, &block)
+      self.send("_initialized_data_#{type.to_s.downcase}")
+
+      if data
+        raise 'Invalid Argument Error' unless data.is_a?(type)
+        @_data = data
+      end
+
+      yield(@_data) if block_given?
+      self
+    end
+
     def _data
       @_data
     end
@@ -65,7 +74,19 @@ module Fson
     end
 
     def _initialized_data_array
+      if @_data.is_a?(Hash)
+        raise 'Invalid State Error: response data already initialized as a Hash'
+      end
+
       @_data ||= []
     end
+
+    def _initialized_data_hash
+      if @_data.is_a?(Array)
+        raise 'Invalid State Error: response data already initialized as an Array'
+      end
+
+      @_data ||= {}
+    end
   end
 end

data/lib/fson/version.rb

@@ -1,3 +1,3 @@
 module Fson
-  VERSION   = '0.0.11'
+  VERSION   = '1.0.0'
 end

data/spec/fson/response/as_json_spec.rb

@@ -8,7 +8,7 @@ describe ::Fson::Response do
       # given
       response = ::Fson::Response.error
                      .add_error('invalid') { |e| e[:id] = 'text-set-1'}
-                     .data { |data| data << {:author => 'Mateusz Kluczny'} }
+                     .data_array { |data| data << {:author => 'Mateusz Kluczny'} }
 
       # when/then
       expect(response.as_json).to eq("{\"status\":\"error\",\"data\":[{\"author\":\"Mateusz Kluczny\"}],\"errors\":[{\"message\":\"invalid\",\"id\":\"text-set-1\"}]}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fson
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 1.0.0
 platform: ruby
 authors:
 - Mateusz Kluczny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec