fire-model 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7af5be10accd37f7897f73aaf3c9d361a3ab3750
-  data.tar.gz: 042a151cfaa0ab58bb224a25878eab3553103c89
+  metadata.gz: f7fd0add86121b4fbf5a68566e37c7263fd06aa5
+  data.tar.gz: c15777871d1c0bf246e586a09ab03b8fb3d2d4c1
 SHA512:
-  metadata.gz: 9755db6aa5104dd42df36d2fb64e7e461c9ae7eb9b023550d19781aee79df88cec60916ec61693f5bba8ebfbdcc1218f0e25fafa696455a11de75cd43fb7fa1b
-  data.tar.gz: 22d64bd1fb51f4de592c4a35f9f69e65fa11d258a21517dff1deba4cf32dcc7ab105ef9e2f783657117e2d5d455a7b10811573d61e6c14405a6804d9e9a4d20f
+  metadata.gz: 94df03e10630d8eca7876f2b321988970e591107ca8e6486cff9c72a310e045a966506d9702361330acc626e0887ef4167edaa2ea010fa246c2a6212c23cd931
+  data.tar.gz: 136759d17f0a80f3d96ab9bae63db8d1614ce6c95dfadf411200d5b12b4c0a7aaead321045e00d86f96bb0fa89b492b85f4c054b8606d7b5fa8e4ed8ed0de286

data/Gemfile

@@ -5,6 +5,8 @@ source 'http://rubygems.org'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
+gem 'tarvit-helpers'
+
 group :development do
   gem 'shoulda', '>= 0'
   gem 'rdoc', '~> 3.12'

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/fire-model.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: fire-model 0.0.1 ruby lib
+# stub: fire-model 0.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fire-model"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<tarvit-helpers>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<rspec>, ["~> 3.2"])
@@ -51,6 +52,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
+      s.add_dependency(%q<tarvit-helpers>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<rspec>, ["~> 3.2"])
@@ -61,6 +63,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<tarvit-helpers>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<rspec>, ["~> 3.2"])

data/lib/fire-model.rb

@@ -2,6 +2,7 @@ module Fire
   require 'connection/response'
   require 'connection/request'
   require 'model'
+
   require 'ostruct'
 
   def self.setup(options)

data/lib/model.rb

@@ -1,13 +1,13 @@
 module Fire
   require 'ostruct'
   require 'active_support'
+  require 'tarvit-helpers'
 
   class Model < OpenStruct
-
+    include TarvitHelpers::NonSharedAccessors
     LEVEL_SEPARATOR = ?/
 
-    cattr_accessor :firebase_path
-    cattr_accessor :global_fire_collection, :global_path_keys
+    non_shared_cattr_accessor :fire_collection, :path_keys
 
     def initialize(attrs={})
       data = self.class.prepare_hash(attrs)
@@ -53,7 +53,7 @@ module Fire
     # Data Methods
 
     def path_values
-      self.class.path_keys.map do |pk|
+      self.class.all_path_keys.map do |pk|
         path_value = send(pk)
         raise PathValueMissingError.new(pk) if path_value.to_s.empty?
         self.class.path_value_param(path_value)
@@ -62,14 +62,14 @@ module Fire
 
     def custom_data(hash=self.data)
       res = hash.to_a.select do |(k, v)|
-        !self.class.path_keys.include?(k)
+        !self.class.all_path_keys.include?(k)
       end
       self.class.prepare_hash(res)
     end
 
     def path_data(hash=self.data)
       res = hash.to_a.select do |(k, v)|
-        self.class.path_keys.include?(k.to_sym)
+        self.class.all_path_keys.include?(k.to_sym)
       end
       self.class.prepare_hash(res)
     end
@@ -99,32 +99,29 @@ module Fire
       # Klass Setters
 
       def in_collection(name)
-        self.global_fire_collection ||= {}
-        self.global_fire_collection[default_collection_name]  = name
+        self.fire_collection = name
       end
 
       def has_path_keys(*keys)
-        self.global_path_keys ||= {}
-        self.global_path_keys[default_collection_name]=keys
+        self.path_keys = keys
       end
 
       # Klass Accessors
 
       def collection_name
-        custom_name = (global_fire_collection && global_fire_collection[default_collection_name])
-        custom_name || default_collection_name
+        self.fire_collection || default_collection_name
       end
 
       def connection
         Fire::Connection::Request.new
       end
 
-      def path_keys
+      def all_path_keys
         own_path_keys + default_path_keys
       end
 
       def own_path_keys
-        (self.global_path_keys || { })[default_collection_name] ||= []
+        self.path_keys || []
       end
 
       # Record Methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fire-model
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Vitaly Tarasenko
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tarvit-helpers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement