databound 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3334543a69fe2a348a91f865c8c2b6896c13c31d
-  data.tar.gz: 59f1dd48c77e71adf27947be93180596962d8350
+  metadata.gz: 62142f1e789c32e120915d4262dc4f304cd10f1a
+  data.tar.gz: 155cd3e12b5898facaebce3154bfa977b4d248af
 SHA512:
-  metadata.gz: f575cf04e296e6b40424cd298a83b7c43c3966e3b17397fa1e7a7aa4c9f8d04d63bb071b3a463f4a0960ebf9b58d6cc6b329a6810c9085c0087d328572e7439e
-  data.tar.gz: 95cf1d3cbb2f8c59f91bae9d24a40fa7e7301f0c68f9bfb3d266713317b009e6d5f0693c906332a893d405ddcfb1d40daf435df2a627909eee771b78cd0d136a
+  metadata.gz: 37bb7f07e1fd980a94a9173aed4bbcbe8985847beeb25e3ca0a5d920c749337a358d509de015bef840ea0303ba3f0565cbe49a187d68b86eac7df12bdf19dccc
+  data.tar.gz: ac96fcfc5914ea90498701d3ea98e3c39267f6b55c55baf574adb92556a86c677dbd40ac697c87137c9d75e881b1e366772f43c70de5389ffb1e1b2c66b6f0aa

data/README.md

@@ -1,8 +1,8 @@
-[![Gem Version](https://badge.fury.io/rb/databound.svg)](http://badge.fury.io/rb/databound)
-[![Bower version](https://badge.fury.io/bo/databound.svg)](http://badge.fury.io/bo/databound)
-[![NPM version](https://badge.fury.io/js/databound.svg)](http://badge.fury.io/js/databound)
-[![Code Climate](https://codeclimate.com/github/Nedomas/databound/badges/gpa.svg)](https://codeclimate.com/github/Nedomas/databound)
-[![Build Status](https://travis-ci.org/Nedomas/databound.svg)](https://travis-ci.org/Nedomas/databound)
+[![Gem](https://img.shields.io/gem/v/databound.svg?style=flat-square)](https://rubygems.org/gems/databound)
+[![Bower](https://img.shields.io/bower/v/databound.svg?style=flat-square)](http://bower.io/search/?q=databound)
+[![npm](https://img.shields.io/npm/v/databound.svg?style=flat-square)](https://www.npmjs.com/package/databound)
+[![Code Climate](http://img.shields.io/codeclimate/github/Nedomas/databound-rails.svg?style=flat-square)](https://codeclimate.com/github/Nedomas/databound)
+[![Build Status](http://img.shields.io/travis/Nedomas/databound-rails.svg?style=flat-square)](https://travis-ci.org/Nedomas/databound)
 
 ![Databound](https://cloud.githubusercontent.com/assets/1877286/4743542/df89dcec-5a28-11e4-9114-6f383fe269cb.png)
 
@@ -32,4 +32,4 @@ This repo is for Ruby on Rails backend part of Databound.
   });
 ```
 
-[More API docs](http://nedomas.github.io/databound/src/databound.html)
+[All API docs](http://nedomas.github.io/databound/src/databound.html)

data/lib/databound.rb

@@ -11,7 +11,11 @@ require 'databound/rails/routes'
 module Databound
   def where
     records = @crud.find_scoped_records
-    render json: serialize_array(records)
+
+    render json: {
+      success: true,
+      records: serialize_array(records),
+    }
   end
 
   def create

data/lib/databound/config.rb

@@ -11,7 +11,7 @@ module Databound
     end
 
     def model(specified_model)
-      raise "Model '#{@model}' already specified" if @model
+      raise ConfigError, "Model '#{@model}' already specified" if @model
 
       @model = specified_model
     end

data/lib/databound/initializer.rb

@@ -7,6 +7,17 @@ module Databound
       send(:define_method, :databound_config) do
         Databound::Config.new(block, model)
       end
+
+      if Rails.application.config.consider_all_requests_local
+        rescue_from Databound::NotPermittedError do |exception|
+          render(
+            status: Databound::NotPermittedError::STATUS,
+            json: {
+              message: exception.to_s,
+            },
+          )
+        end
+      end
     end
   end
 end

data/lib/databound/manager.rb

@@ -1,5 +1,7 @@
 module Databound
-  class NotPermittedError < RuntimeError; end
+  class NotPermittedError < RuntimeError; STATUS = 405; end
+  class ConfigError < RuntimeError; end
+
   class Manager
     def initialize(controller)
       @controller = controller
@@ -65,9 +67,7 @@ module Databound
         model.where(scope.to_h).where_values.reduce(:and)
       end
 
-      nodes[1..-1].reduce(nodes.first) do |memo, node|
-        node.or(memo)
-      end
+      nodes.reduce(:or)
     end
 
     def check_params!(action)
@@ -119,7 +119,7 @@ module Databound
       elsif activerecord?
         model.column_names.map(&:to_sym)
       else
-        raise 'ORM not supported. Use ActiveRecord or Mongoid'
+        raise ConfigError, 'ORM not supported. Use ActiveRecord or Mongoid'
       end
     end
 
@@ -132,7 +132,7 @@ module Databound
     end
 
     def model
-      raise 'No model specified' unless model_name
+      raise ConfigError, 'No model specified' unless model_name
 
       model_name.to_s.camelize.constantize
     end

data/lib/databound/version.rb

@@ -1,3 +1,3 @@
 module Databound
-  VERSION = '3.0.3'
+  VERSION = '3.1.0'
 end

data/lib/generators/databound/install/templates/databound-standalone.js

@@ -1,4 +1,5 @@
-var Databound;
+var Databound, DataboundError,
+  __slice = [].slice;
 
 Databound = (function() {
   function Databound(endpoint, scope, options) {
@@ -27,20 +28,31 @@ Databound = (function() {
   Databound.prototype.where = function(params) {
     var _this;
     _this = this;
-    return this.request('where', params).then(function(records) {
-      records = records.concat(_this.seeds);
+    return this.wrappedRequest('where', params).then(function(resp) {
+      var records;
+      records = JSON.parse(resp.records).concat(_this.seeds);
       _this.records = _.sortBy(records, 'id');
       return _this.promise(_this.records);
     });
   };
 
+  Databound.prototype.all = function() {
+    return this.where();
+  };
+
   Databound.prototype.find = function(id) {
     var _this;
+    this.checkUndefinedId('find', id);
     _this = this;
     return this.where({
       id: id
     }).then(function() {
-      return _this.promise(_this.take(id));
+      var record;
+      record = _this.take(id);
+      if (!record) {
+        throw new DataboundError("Couldn't find record with id: " + id);
+      }
+      return _this.promise(record);
     });
   };
 
@@ -61,6 +73,7 @@ Databound = (function() {
   };
 
   Databound.prototype.destroy = function(id) {
+    this.checkUndefinedId('destroy', id);
     return this.requestAndRefresh('destroy', {
       id: id
     });
@@ -83,11 +96,8 @@ Databound = (function() {
   Databound.prototype.requestAndRefresh = function(action, params) {
     var _this;
     _this = this;
-    return this.request(action, params).then(function(resp) {
+    return this.wrappedRequest(action, params).then(function(resp) {
       var records, records_with_seeds;
-      if (!(resp != null ? resp.success : void 0)) {
-        throw new Error('Error in the backend');
-      }
       records = JSON.parse(resp.scoped_records);
       records_with_seeds = records.concat(_this.seeds);
       _this.records = _.sortBy(records_with_seeds, 'id');
@@ -115,6 +125,47 @@ Databound = (function() {
     };
   };
 
+  Databound.prototype.wrappedRequest = function() {
+    var args;
+    args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+    return this.request.apply(this, args).then(_.bind(this.handleSuccess, this)).fail(this.handleFailure);
+  };
+
+  Databound.prototype.handleSuccess = function(resp) {
+    if (!(resp != null ? resp.success : void 0)) {
+      throw new Error('Error in the backend');
+    }
+    return this.promise(resp);
+  };
+
+  Databound.prototype.handleFailure = function(e) {
+    if (e.status === DataboundError.STATUS) {
+      throw new DataboundError(e.responseJSON.message);
+    } else {
+      throw new Error("Error in the backend with status " + e.status);
+    }
+  };
+
+  Databound.prototype.checkUndefinedId = function(action, id) {
+    if (!_.isUndefined(id)) {
+      return;
+    }
+    throw new DataboundError("Couldn't " + action + " a record without an id");
+  };
+
   return Databound;
 
 })();
+
+DataboundError = (function() {
+  function DataboundError(text) {
+    this.message = "Databound: " + text;
+  }
+
+  DataboundError.STATUS = 405;
+
+  return DataboundError;
+
+})();
+
+DataboundError.prototype = new Error();

data/spec/controllers/columns_controller_spec.rb

@@ -10,7 +10,8 @@ describe PostsController, type: :controller do
         scope: {},
       }
 
-      expect { post(:create, javascriptize(data)) }.to raise_error(
+      assert_responses(
+        -> { post(:create, javascriptize(data)) },
         Databound::NotPermittedError,
         'Request includes unpermitted columns: city',
       )
@@ -39,7 +40,8 @@ describe ColumnsController, type: :controller do
         scope: {},
       }
 
-      expect { post(:create, javascriptize(data)) }.to raise_error(
+      assert_responses(
+        -> { post(:create, javascriptize(data)) },
         Databound::NotPermittedError,
         'Request includes unpermitted columns: city',
       )
@@ -71,7 +73,8 @@ describe ColumnsController, type: :controller do
         scope: {},
       }
 
-      expect { post(:update, javascriptize(data)) }.to raise_error(
+      assert_responses(
+        -> { post(:update, javascriptize(data)) },
         Databound::NotPermittedError,
         'Request includes unpermitted columns: city',
       )
@@ -100,7 +103,8 @@ describe ColumnsController, type: :controller do
           scope: { city: 'Barcelona' },
         }
 
-        expect { post(:create, javascriptize(data)) }.to raise_error(
+        assert_responses(
+          -> { post(:create, javascriptize(data)) },
           Databound::NotPermittedError,
           'Request includes unpermitted columns: city',
         )
@@ -117,7 +121,8 @@ describe ColumnsController, type: :controller do
           scope: { city: 'Barcelona' },
         }
 
-        expect { post(:update, javascriptize(data)) }.to raise_error(
+        assert_responses(
+          -> { post(:update, javascriptize(data)) },
           Databound::NotPermittedError,
           'Request includes unpermitted columns: city',
         )

data/spec/controllers/databound_spec.rb

@@ -44,7 +44,7 @@ describe UsersController, type: :controller do
       }
 
       post(:where, javascriptize(data))
-      expect(rubize(response)).to eq([])
+      expect(rubize(response)).to eq(success: true, records: [])
     end
 
     it 'respond with correct records' do
@@ -56,7 +56,7 @@ describe UsersController, type: :controller do
       }
 
       post(:where, javascriptize(data))
-      expect(gather(:name, response)).to eq(%w(John Peter))
+      expect(gather(:records, :name, response)).to eq(%w(John Peter))
     end
   end
 

data/spec/controllers/dsl_controller_spec.rb

@@ -80,7 +80,8 @@ describe DslController, type: :controller do
           scope: {},
         }
 
-        expect { post(:create, javascriptize(data)) }.to raise_error(
+        assert_responses(
+          -> { post(:create, javascriptize(data)) },
           Databound::NotPermittedError,
           "DSL column 'city' received unmatched string 'New York'." \
           " Use 'strict: false' in DSL definition to allow everything.",
@@ -176,7 +177,8 @@ describe DslController, type: :controller do
           scope: {},
         }
 
-        expect { post(:create, javascriptize(data)) }.to raise_error(
+        assert_responses(
+          -> { post(:create, javascriptize(data)) },
           Databound::NotPermittedError,
           "DSL column 'city' received unmatched string 'New York'." \
           " Use 'strict: false' in DSL definition to allow everything.",

data/spec/controllers/permit_controller_spec.rb

@@ -18,7 +18,8 @@ describe PermitController, type: :controller do
         scope: {},
       }
 
-      expect { post(:where, javascriptize(data)) }.to raise_error(
+      assert_responses(
+        -> { post(:where, javascriptize(data)) },
         Databound::NotPermittedError,
         'Request for read not permitted',
       )
@@ -47,7 +48,8 @@ describe PermitController, type: :controller do
         scope: {},
       }
 
-      expect { post(:create, javascriptize(data)) }.to raise_error(
+      assert_responses(
+        -> { post(:create, javascriptize(data)) },
         Databound::NotPermittedError,
         'Request for create not permitted',
       )
@@ -76,7 +78,8 @@ describe PermitController, type: :controller do
         scope: {},
       }
 
-      expect { post(:update, javascriptize(data)) }.to raise_error(
+      assert_responses(
+        -> { post(:update, javascriptize(data)) },
         Databound::NotPermittedError,
         'Request for update not permitted',
       )
@@ -104,7 +107,8 @@ describe PermitController, type: :controller do
         scope: {},
       }
 
-      expect { post(:destroy, javascriptize(data)) }.to raise_error(
+      assert_responses(
+        -> { post(:destroy, javascriptize(data)) },
         Databound::NotPermittedError,
         'Request for destroy not permitted',
       )

data/spec/controllers/routes_opts_controller_spec.rb

@@ -10,7 +10,8 @@ describe PostsController, type: :controller do
         scope: {},
       }
 
-      expect { post(:create, javascriptize(data)) }.to raise_error(
+      assert_responses(
+        -> { post(:create, javascriptize(data)) },
         Databound::NotPermittedError,
         'Request includes unpermitted columns: description',
       )
@@ -42,7 +43,8 @@ describe PostsController, type: :controller do
         scope: {},
       }
 
-      expect { post(:update, javascriptize(data)) }.to raise_error(
+      assert_responses(
+        -> { post(:update, javascriptize(data)) },
         Databound::NotPermittedError,
         'Request includes unpermitted columns: description',
       )
@@ -71,7 +73,8 @@ describe PostsController, type: :controller do
           scope: { description: 'Barcelona' },
         }
 
-        expect { post(:create, javascriptize(data)) }.to raise_error(
+        assert_responses(
+          -> { post(:create, javascriptize(data)) },
           Databound::NotPermittedError,
           'Request includes unpermitted columns: description',
         )
@@ -88,7 +91,8 @@ describe PostsController, type: :controller do
           scope: { description: 'Barcelona 2' },
         }
 
-        expect { post(:update, javascriptize(data)) }.to raise_error(
+        assert_responses(
+          -> { post(:update, javascriptize(data)) },
           Databound::NotPermittedError,
           'Request includes unpermitted columns: description',
         )

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ def javascriptize(ruby_obj)
 end
 
 def rubize(response)
-  convert_scoped_records(optionize(JSON.parse(response.body)))
+  convert_records(optionize(JSON.parse(response.body)))
 end
 
 def optionize(obj)
@@ -30,22 +30,38 @@ def optionize(obj)
   end
 end
 
-def convert_scoped_records(obj)
-  return obj unless obj.is_a?(Hash)
-  result = obj
+def convert_records(data)
+  return data unless data.is_a?(Hash)
 
-  converted = JSON.parse(obj[:scoped_records]).map do |record|
-    record.except('created_at', 'updated_at')
-  end
+  %i(records scoped_records).each_with_object(data) do |type, obj|
+    next unless data[type]
 
-  result[:scoped_records] = converted
-  result
+    obj[type] = JSON.parse(data[type]).map do |r|
+      r.except('created_at', 'updated_at')
+    end
+  end
 end
 
-def gather(attribute, response)
-  rubize(response).map { |record| record[attribute] }
+def gather(collection, attribute, response)
+  rubize(response)[collection].map { |record| record.to_options[attribute] }
 end
 
 def all_records(model = User)
   model.select(:id, :name, :city).map(&:attributes)
 end
+
+def assert_responses(code, error, msg)
+  friendly_handler = controller.class.rescue_handlers.first.last
+
+  controller.class.rescue_from(error) { raise error, msg }
+  expect(code).to raise_error(error, msg)
+
+  # check friendly handler
+  controller.class.rescue_from(error, with: friendly_handler)
+  code.call
+
+  expect(response.status).to eq(error::STATUS)
+  expect(rubize(response)).to eq(
+    message: msg,
+  )
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: databound
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Domas Bitvinskas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails