databound 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22275b2aa2e135427ffb2cccc53091c913706ef5
-  data.tar.gz: 93ad22a8162a45950b0bee675b03a098c6fa663c
+  metadata.gz: 289b15c39df408fc4735e260935f31f1ba838864
+  data.tar.gz: cce0136f4944ad481260a3f67f87f89cd0ccb0ea
 SHA512:
-  metadata.gz: 1e9ae816ef58f24a27a57cdc819fcaea49b250ae8bf9feffca6c4fa7b998c1f1629863b044a6f27bf60bff641c9df200f7b372a72f3529acb20483e7f45be6be
-  data.tar.gz: 27dbd28d0751ba595b92836eb2c271a7a45a8b127cf31a04de620dc79c08044485635713824fe373dc0cdc123657e07b68a3653d5fb2de09671d96f87f978398
+  metadata.gz: 54c8cce84add784169e125791bf03f0539d1f12811ad3aef0f449062cb2276af591a22910aac8d456526864ca9041ae009ee72f582f2b95fc4d1bd9976fc59ce
+  data.tar.gz: 20094e491ebdd45925315c42bc1d90c9f28e376663b36c864f726363a426c81930749dbf3e5bf3905a2885366903cfdf7e68c74587c92f529016f252f40db286

data/README.md

@@ -1,19 +1,19 @@
-[![Code Climate](https://codeclimate.com/github/Nedomas/databound/badges/gpa.svg)](https://codeclimate.com/github/Nedomas/databound-rails)
+[![Code Climate](https://codeclimate.com/github/Nedomas/databound-rails/badges/gpa.svg)](https://codeclimate.com/github/Nedomas/databound-rails)
 [![Gem Version](https://badge.fury.io/rb/databound.svg)](http://badge.fury.io/rb/databound)
-[![Build Status](https://travis-ci.org/Nedomas/databound.svg?branch=master)](https://travis-ci.org/Nedomas/databound-rails)
-[![Dependency Status](https://gemnasium.com/Nedomas/databound.svg)](https://gemnasium.com/Nedomas/databound-rails)
+[![Build Status](https://travis-ci.org/Nedomas/databound-rails.svg?branch=master)](https://travis-ci.org/Nedomas/databound-rails)
+[![Dependency Status](https://gemnasium.com/Nedomas/databound-rails.svg)](https://gemnasium.com/Nedomas/databound-rails)
 
 ![Databound](https://cloud.githubusercontent.com/assets/1877286/4743542/df89dcec-5a28-11e4-9114-6f383fe269cb.png)
 
-Exposes ActiveRecord records to the Javascript side.
+Exposes database ORM to the Javascript side.
 
-This is the **Ruby on Rails** backend part for the ``Databound`` javascript lib.
+Ruby on Rails backend for the Databound javascript lib. Supports ActiveRecord and Mongoid
 
 For more information go to [javascript Databound repo](https://github.com/Nedomas/databound).
 
 ## Javascript library
 
-It does something like this out of the box.
+Out of the box it does something like this.
 
 ```js
   User = new Databound('/users');

data/databound.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Databound::VERSION
   spec.authors       = ['Domas Bitvinskas']
   spec.email         = ['domas.bitvinskas@me.com']
-  spec.summary       = %q{ActiveRecord exposed to the Javascript side and guarded by guns}
-  spec.description   = %q{This is the Ruby on Rails backend part for the Databound javascript lib.}
+  spec.summary       = %q{Exposes database ORM to the Javascript side}
+  spec.description   = %q{Ruby on Rails backend for the Databound javascript lib. Supports ActiveRecord and Mongoid}
   spec.homepage      = 'https://github.com/Nedomas/databound'
   spec.license       = 'MIT'
 
@@ -18,12 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'andand'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'combustion', '~> 0.5.2'
   spec.add_development_dependency 'rails'
   spec.add_development_dependency 'sqlite3'
-
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-stack_explorer'
   spec.add_development_dependency 'bundler', '~> 1.6'

data/lib/databound.rb

@@ -1,5 +1,4 @@
-require 'andand'
-
+require 'databound/extensions'
 require 'databound/version'
 require 'databound/data'
 require 'databound/manager'
@@ -13,8 +12,7 @@ module Databound
 
   def where
     records = @crud.find_scoped_records
-
-    render json: serialized(records)
+    render json: serialize_array(records)
   end
 
   def create
@@ -22,7 +20,8 @@ module Databound
 
     render json: {
       success: true,
-      id: record.id,
+      id: serialize(record, :id),
+      scoped_records: serialize_array(scoped_records),
     }
   end
 
@@ -31,7 +30,8 @@ module Databound
 
     render json: {
       success: true,
-      id: record.id,
+      id: serialize(record, :id),
+      scoped_records: serialize_array(scoped_records),
     }
   end
 
@@ -40,12 +40,13 @@ module Databound
 
     render json: {
       success: true,
+      scoped_records: serialize_array(scoped_records),
     }
   end
 
   private
 
-  def serialized(records)
+  def serialize_array(records)
     return records unless defined?(ActiveModel::Serializer)
 
     serializer = ActiveModel::Serializer.serializer_for(records.first)
@@ -54,19 +55,47 @@ module Databound
     ActiveModel::ArraySerializer.new(records).to_json
   end
 
+  def serialize(record, attribute)
+    unserialized = record.send(attribute)
+    return unserialized unless defined?(ActiveModel::Serializer)
+
+    serializer = ActiveModel::Serializer.serializer_for(record)
+    return unserialized unless serializer
+
+    serializer.new(record).attributes[:id]
+  end
+
   def model
     raise 'Override model method to specify a model to be used in CRUD'
   end
 
   def permitted_columns
     # permit all by default
-    model.column_names
+    if mongoid?
+      model.fields.keys.map(&:to_sym)
+    elsif activerecord?
+      model.column_names
+    else
+      raise 'ORM not supported. Use ActiveRecord or Mongoid'
+    end
+  end
+
+  def mongoid?
+    defined?(Moigoid) and model.ancestors.include?(Mongoid::Document)
+  end
+
+  def activerecord?
+    defined?(ActiveRecord) and model.ancestors.include?(ActiveRecord::Base)
   end
 
   def init_crud
     @crud = Databound::Manager.new(self)
   end
 
+  def scoped_records
+    @crud.find_scoped_records(only_extra_scopes: true)
+  end
+
   module ClassMethods
     attr_reader :dsls
     attr_reader :stricts

data/lib/databound/data.rb

@@ -24,16 +24,16 @@ module Databound
         check_strict!(key, val)
 
         block = dsl_block(key, val)
-        obj[key] = block ? block.call(@params.to_options) : val
+        obj[key] = block ? @controller.instance_exec(@params.to_options, &block) : val
       end
     end
 
     def dsl_block(key, val)
-      dsl_key(key).andand[val]
+      swallow_nil { dsl_key(key)[val] }
     end
 
     def dsl_key(key)
-      @controller.class.dsls.andand[key]
+      swallow_nil { @controller.class.dsls[key] }
     end
 
     def check_strict!(key, val)
@@ -45,7 +45,7 @@ module Databound
     end
 
     def strict?(key)
-      @controller.class.stricts.andand[key]
+      swallow_nil { @controller.class.stricts[key] }
     end
   end
 end

data/lib/databound/extensions.rb

@@ -0,0 +1,7 @@
+# module Databound
+# end
+def swallow_nil
+  yield
+rescue NoMethodError
+  nil
+end

data/lib/databound/manager.rb

@@ -17,7 +17,7 @@ module Databound
       end
     end
 
-    def find_scoped_records
+    def find_scoped_records(only_extra_scopes: false)
       records = []
       records << @scope.records(@model)
 
@@ -25,7 +25,11 @@ module Databound
         records << extra_scope.records(@model)
       end
 
-      records.map { |record| record.where(@data) }.flatten
+      if only_extra_scopes
+        records.flatten
+      else
+        records.map { |record| record.where(@data) }.flatten
+      end
     end
 
     def create_from_data
@@ -50,11 +54,15 @@ module Databound
     private
 
     def check_params!
-      requested = [@scope, @data].map(&:to_h).flat_map(&:keys)
-      unpermitted = requested - @permitted_columns.map(&:to_s)
-      return if unpermitted.empty?
+      return if @permitted_columns == :all
+      return if unpermitted_columns.empty?
 
-      raise NotPermittedError, "Request includes unpermitted columns: #{unpermitted.join(', ')}"
+      raise NotPermittedError, "Request includes unpermitted columns: #{unpermitted_columns.join(', ')}"
+    end
+
+    def unpermitted_columns
+      requested = [@scope, @data].map(&:to_h).flat_map(&:keys)
+      requested - @permitted_columns.map(&:to_s)
     end
   end
 end

data/lib/databound/version.rb

@@ -1,3 +1,3 @@
 module Databound
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/spec/controllers/databound_spec.rb

@@ -15,7 +15,11 @@ describe UsersController, type: :controller do
     end
 
     it 'responds consistently to js' do
-      expect(rubize(response)).to eq(success: true, id: 1)
+      expect(rubize(response)).to eq(
+        success: true,
+        id: 1,
+        scoped_records: all_records,
+      )
     end
 
     it 'creates the record' do
@@ -79,7 +83,11 @@ describe UsersController, type: :controller do
       end
 
       it 'respond with updated record id' do
-        expect(rubize(response)).to eq(success: true, id: @user.id)
+        expect(rubize(response)).to eq(
+          success: true,
+          id: @user.id,
+          scoped_records: all_records,
+        )
       end
 
       it 'do the update' do
@@ -119,7 +127,10 @@ describe UsersController, type: :controller do
       end
 
       it 'respond with success' do
-        expect(rubize(response)).to eq(success: true)
+        expect(rubize(response)).to eq(
+          success: true,
+          scoped_records: all_records,
+        )
       end
     end
 

data/spec/controllers/dsl_controller_spec.rb

@@ -18,7 +18,11 @@ describe DslController, type: :controller do
         end
 
         it 'responds consistently to js' do
-          expect(rubize(response)).to eq(success: true, id: 1)
+          expect(rubize(response)).to eq(
+            success: true,
+            id: 1,
+            scoped_records: all_records,
+          )
         end
 
         it 'creates the record' do
@@ -48,7 +52,11 @@ describe DslController, type: :controller do
         end
 
         it 'responds consistently to js' do
-          expect(rubize(response)).to eq(success: true, id: 1)
+          expect(rubize(response)).to eq(
+            success: true,
+            id: 1,
+            scoped_records: all_records,
+          )
         end
 
         it 'creates the record' do
@@ -103,7 +111,11 @@ describe DslController, type: :controller do
         end
 
         it 'responds consistently to js' do
-          expect(rubize(response)).to eq(success: true, id: 1)
+          expect(rubize(response)).to eq(
+            success: true,
+            id: 1,
+            scoped_records: all_records,
+          )
         end
 
         it 'updates the record' do
@@ -136,7 +148,11 @@ describe DslController, type: :controller do
         end
 
         it 'responds consistently to js' do
-          expect(rubize(response)).to eq(success: true, id: 1)
+          expect(rubize(response)).to eq(
+            success: true,
+            id: 1,
+            scoped_records: all_records,
+          )
         end
 
         it 'updates the record' do

data/spec/controllers/loose_dsl_controller_spec.rb

@@ -16,7 +16,11 @@ describe LooseDslController, type: :controller do
     end
 
     it 'responds consistently to js' do
-      expect(rubize(response)).to eq(success: true, id: 1)
+      expect(rubize(response)).to eq(
+        success: true,
+        id: 1,
+        scoped_records: all_records,
+      )
     end
 
     it 'creates the record' do
@@ -46,7 +50,11 @@ describe LooseDslController, type: :controller do
     end
 
     it 'responds consistently to js' do
-      expect(rubize(response)).to eq(success: true, id: 1)
+      expect(rubize(response)).to eq(
+        success: true,
+        id: 1,
+        scoped_records: all_records,
+      )
     end
 
     it 'creates the record' do
@@ -78,7 +86,11 @@ describe LooseDslController, type: :controller do
     end
 
     it 'responds consistently to js' do
-      expect(rubize(response)).to eq(success: true, id: 1)
+      expect(rubize(response)).to eq(
+        success: true,
+        id: 1,
+        scoped_records: all_records,
+      )
     end
 
     it 'updates the record' do
@@ -110,7 +122,11 @@ describe LooseDslController, type: :controller do
     end
 
     it 'responds consistently to js' do
-      expect(rubize(response)).to eq(success: true, id: 1)
+      expect(rubize(response)).to eq(
+        success: true,
+        id: 1,
+        scoped_records: all_records,
+      )
     end
 
     it 'updates the record' do

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ def javascriptize(ruby_obj)
 end
 
 def rubize(response)
-  optionize(JSON.parse(response.body))
+  convert_scoped_records(optionize(JSON.parse(response.body)))
 end
 
 def optionize(obj)
@@ -31,6 +31,22 @@ def optionize(obj)
   end
 end
 
+def convert_scoped_records(obj)
+  return obj unless obj.is_a?(Hash)
+  result = obj
+
+  converted = obj[:scoped_records].map do |record|
+    record.except('created_at', 'updated_at')
+  end
+
+  result[:scoped_records] = converted
+  result
+end
+
 def gather(attribute, response)
   rubize(response).map { |record| record[attribute] }
 end
+
+def all_records
+  User.select(:id, :name, :city).map(&:attributes)
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: databound
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Domas Bitvinskas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: andand
-  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: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +122,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: This is the Ruby on Rails backend part for the Databound javascript lib.
+description: Ruby on Rails backend for the Databound javascript lib. Supports ActiveRecord
+  and Mongoid
 email:
 - domas.bitvinskas@me.com
 executables: []
@@ -153,6 +140,7 @@ files:
 - databound.gemspec
 - lib/databound.rb
 - lib/databound/data.rb
+- lib/databound/extensions.rb
 - lib/databound/manager.rb
 - lib/databound/rails/routes.rb
 - lib/databound/version.rb
@@ -247,7 +235,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: ActiveRecord exposed to the Javascript side and guarded by guns
+summary: Exposes database ORM to the Javascript side
 test_files:
 - spec/controllers/databound_spec.rb
 - spec/controllers/dsl_controller_spec.rb