dataclips 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02567b12e66680de603147dcdcebea95f75d6507
-  data.tar.gz: a753046f425091a584835e5e56d4df51b232d34b
+  metadata.gz: 5ca7cb1648bf67bb1137f79f879b3dfe84aeed17
+  data.tar.gz: 2e1846eae1cab891fdbf70252a08a9bf5e26f9b7
 SHA512:
-  metadata.gz: 0370162f19bebf935089f57a31c82d5013293aec92156791981710351db285d0f89e5fc4a6968481584903a5b41342dd1a685b6a389c7789a13a30c390cef281
-  data.tar.gz: faf3d85dc2a5f7a5e9e3abb353086813388c683a5edc3245dad6308e902449460a9cfc5143ee320afbd45b8d905c3f27d6546ab92de391298526fbda1b858bb7
+  metadata.gz: 46f7b3618ce519b8e31e1bada3d8a9aa8ab8fce78bb769d19945dbc13ce5f8389a9a3a4ebd20b0a60caa1c8a05dd78fdf341707ddf7398822cd5581492c07c6a
+  data.tar.gz: 4cb87c380933ae302404d0d9583fdea62e2aa4b523043727834232ee46bb6d8c9d62279ed4f01e76a60db91283e11ee6fd176815f3905a7d324d942fd5b60f93

data/app/assets/javascripts/dataclips/application.js

@@ -23,4 +23,5 @@
 //= require ./namespace
 //= require ./formatters
 //= require ./record
+//= require ./records
 //= require ./dataclips

data/app/assets/javascripts/dataclips/record.js.coffee

@@ -12,28 +12,3 @@ class Dataclips.Record extends Backbone.Model
 
     attributes.id = @cid
     super(attributes)
-
-
-class Dataclips.Records extends Backbone.Collection
-  model: Dataclips.Record
-  fetchInBatches: (defaultParams = {}) ->
-
-    fetchNextPage = (collection, current_page, total_pages) ->
-      if current_page < total_pages
-        collection.fetch
-          data: _({page: current_page + 1}).extend(defaultParams),
-          remove: false,
-          success: (collection, data) ->
-            collection.trigger "batchInsert", data.orders
-            fetchNextPage(collection, data.page, data.total_pages)
-
-    @fetch
-      data: defaultParams
-      success: (collection, data) ->
-        $("span.total_entries").text(data.total_entries)
-        collection.trigger "batchInsert", data.records
-        fetchNextPage(collection, data.page, data.total_pages)
-      error: (collection, response) ->
-        alert(response.responseText)
-
-  parse: (data) -> data.records

data/app/assets/javascripts/dataclips/records.js.coffee

@@ -0,0 +1,23 @@
+class Dataclips.Records extends Backbone.Collection
+  model: Dataclips.Record
+  fetchInBatches: (defaultParams = {}) ->
+
+    fetchNextPage = (collection, current_page, total_pages) ->
+      if current_page < total_pages
+        collection.fetch
+          data: _({page: current_page + 1}).extend(defaultParams),
+          remove: false,
+          success: (collection, data) ->
+            collection.trigger "batchInsert", data.orders
+            fetchNextPage(collection, data.page, data.total_pages)
+
+    @fetch
+      data: defaultParams
+      success: (collection, data) ->
+        $("span.total_entries").text(data.total_entries)
+        collection.trigger "batchInsert", data.records
+        fetchNextPage(collection, data.page, data.total_pages)
+      error: (collection, response) ->
+        alert(response.responseText)
+
+  parse: (data) -> data.records

data/app/assets/stylesheets/dataclips/application.css

@@ -10,7 +10,8 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require ./_bootstrap
+ += require twitter-bootstrap-static/bootstrap
+ += requrie twitter-bootstrap-static/fontawesome
  *= require bootstrap-datetimepicker
 
  *= require_tree .

data/app/controllers/dataclips/application_controller.rb

@@ -6,9 +6,14 @@ module Dataclips
     protected
 
     def initialize_clip(clip_id)
-      @klass     = "Dataclips::#{clip_id.camelize}".constantize
-      @schema    = @klass.schema
-      @variables = @klass.variables
+      begin
+        @klass     = "Dataclips::#{clip_id.camelize}".constantize
+        @schema    = @klass.schema
+        @variables = @klass.variables
+      rescue NameError
+        Rails.logger.fatal("Dataclip: #{clip_id} does not exist.")
+        nil
+      end
     end
 
     def localize_headers(clip_id, keys)
@@ -18,7 +23,7 @@ module Dataclips
       end
     end
 
-    def process_json(clip, page = 1)
+    def render_json_records(clip, page = 1)
       records = clip.paginate(params[:page] || 1)
       render json: {
         page:          records.current_page,

data/app/controllers/dataclips/clips_controller.rb

@@ -3,38 +3,35 @@ module Dataclips
     def show
       @clip_id = params[:clip_id]
 
-      begin
-        initialize_clip(@clip_id)
-      rescue
-        raise ActionController::RoutingError.new('Not Found')
-      end
-
-      @headers = localize_headers(@clip_id, @schema.keys)
-
-      @clip = @klass.new params.slice(*@variables.keys)
-
-      respond_to do |format|
-        format.html do
-          begin
-            require_parameters
-          rescue ActionController::ParameterMissing => e
-            @error = e
-            render :edit
+      if initialize_clip(@clip_id)
+        @headers = localize_headers(@clip_id, @schema.keys)
+
+        @clip = @klass.new params.slice(*@variables.keys)
+
+        respond_to do |format|
+          format.html do
+            begin
+              require_parameters
+            rescue ActionController::ParameterMissing => e
+              @error = e
+              render :require_variables
+            end
           end
-        end
 
-        format.json do
-          begin
-            process_json(@clip, params[:page])
-          rescue ActiveRecord::StatementInvalid => e
-            render json: e.message, status: :unprocessable_entity
+          format.json do
+            begin
+              require_parameters
+              render_json_records(@clip, params[:page])
+            rescue ActiveRecord::StatementInvalid => e
+              render json: e.message, status: :unprocessable_entity
+            end
           end
         end
+      else
+        raise ActionController::RoutingError.new('Not Found')
       end
     end
 
-    def edit; end
-
     private
 
     def require_parameters

data/app/controllers/dataclips/insights_controller.rb

@@ -28,7 +28,7 @@ module Dataclips
 
       respond_to do |format|
         format.html
-        format.json { process_json(@clip, params[:page]) }
+        format.json { render_josn_records(@clip, params[:page]) }
       end
     end
 

data/lib/dataclips/engine.rb

@@ -9,21 +9,8 @@ module Dataclips
       config.watchable_files.concat Dir.glob("#{config.path}/*.sql")
     end
 
-    # config.before_initialize do
-    # end
-
-    initializer "dataclips.assets.precompile" do |app|
-      %w(stylesheets javascripts fonts images).each do |sub|
-        app.config.assets.paths << root.join('app/assets', sub).to_s
-      end
-      app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff2?)$)
-    end
-
     config.to_prepare do |reloader|
       Dataclips.reload!
     end
-
-    # config.after_initialize do
-    # end
   end
 end

data/lib/dataclips/version.rb

@@ -1,3 +1,3 @@
 module Dataclips
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dataclips
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tomasz Mazur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,72 +28,72 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: hashids
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: twitter-bootstrap-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: momentjs-rails
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.14
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.14
+        version: '4.7'
 description: Heroku inspired dataclips for your application.
 email:
 - defkode@gmail.com
@@ -132,11 +132,6 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- app/assets/fonts/bootstrap/glyphicons-halflings-regular.eot
-- app/assets/fonts/bootstrap/glyphicons-halflings-regular.svg
-- app/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf
-- app/assets/fonts/bootstrap/glyphicons-halflings-regular.woff
-- app/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2
 - app/assets/images/dataclips/slickgrid/sort-asc.png
 - app/assets/images/dataclips/slickgrid/sort-desc.png
 - app/assets/javascripts/dataclips/application.js
@@ -145,6 +140,7 @@ files:
 - app/assets/javascripts/dataclips/formatters.js.coffee
 - app/assets/javascripts/dataclips/namespace.js.coffee
 - app/assets/javascripts/dataclips/record.js.coffee
+- app/assets/javascripts/dataclips/records.js.coffee
 - app/assets/javascripts/dataclips/slickgrid.js
 - app/assets/javascripts/dataclips/slickgrid/jquery.event.drag-2.2.js
 - app/assets/javascripts/dataclips/slickgrid/plugins/slick.rowselectionmodel.js
@@ -152,76 +148,6 @@ files:
 - app/assets/javascripts/dataclips/slickgrid/slick.dataview.js
 - app/assets/javascripts/dataclips/slickgrid/slick.grid.js
 - app/assets/javascripts/dataclips/underscore.js
-- app/assets/stylesheets/bootstrap/_alerts.scss
-- app/assets/stylesheets/bootstrap/_badges.scss
-- app/assets/stylesheets/bootstrap/_breadcrumbs.scss
-- app/assets/stylesheets/bootstrap/_button-groups.scss
-- app/assets/stylesheets/bootstrap/_buttons.scss
-- app/assets/stylesheets/bootstrap/_carousel.scss
-- app/assets/stylesheets/bootstrap/_close.scss
-- app/assets/stylesheets/bootstrap/_code.scss
-- app/assets/stylesheets/bootstrap/_component-animations.scss
-- app/assets/stylesheets/bootstrap/_dropdowns.scss
-- app/assets/stylesheets/bootstrap/_forms.scss
-- app/assets/stylesheets/bootstrap/_glyphicons.scss
-- app/assets/stylesheets/bootstrap/_grid.scss
-- app/assets/stylesheets/bootstrap/_input-groups.scss
-- app/assets/stylesheets/bootstrap/_jumbotron.scss
-- app/assets/stylesheets/bootstrap/_labels.scss
-- app/assets/stylesheets/bootstrap/_list-group.scss
-- app/assets/stylesheets/bootstrap/_media.scss
-- app/assets/stylesheets/bootstrap/_mixins.scss
-- app/assets/stylesheets/bootstrap/_modals.scss
-- app/assets/stylesheets/bootstrap/_navbar.scss
-- app/assets/stylesheets/bootstrap/_navs.scss
-- app/assets/stylesheets/bootstrap/_normalize.scss
-- app/assets/stylesheets/bootstrap/_pager.scss
-- app/assets/stylesheets/bootstrap/_pagination.scss
-- app/assets/stylesheets/bootstrap/_panels.scss
-- app/assets/stylesheets/bootstrap/_popovers.scss
-- app/assets/stylesheets/bootstrap/_print.scss
-- app/assets/stylesheets/bootstrap/_progress-bars.scss
-- app/assets/stylesheets/bootstrap/_responsive-embed.scss
-- app/assets/stylesheets/bootstrap/_responsive-utilities.scss
-- app/assets/stylesheets/bootstrap/_scaffolding.scss
-- app/assets/stylesheets/bootstrap/_tables.scss
-- app/assets/stylesheets/bootstrap/_theme.scss
-- app/assets/stylesheets/bootstrap/_thumbnails.scss
-- app/assets/stylesheets/bootstrap/_tooltip.scss
-- app/assets/stylesheets/bootstrap/_type.scss
-- app/assets/stylesheets/bootstrap/_utilities.scss
-- app/assets/stylesheets/bootstrap/_variables.scss
-- app/assets/stylesheets/bootstrap/_wells.scss
-- app/assets/stylesheets/bootstrap/mixins/_alerts.scss
-- app/assets/stylesheets/bootstrap/mixins/_background-variant.scss
-- app/assets/stylesheets/bootstrap/mixins/_border-radius.scss
-- app/assets/stylesheets/bootstrap/mixins/_buttons.scss
-- app/assets/stylesheets/bootstrap/mixins/_center-block.scss
-- app/assets/stylesheets/bootstrap/mixins/_clearfix.scss
-- app/assets/stylesheets/bootstrap/mixins/_forms.scss
-- app/assets/stylesheets/bootstrap/mixins/_gradients.scss
-- app/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
-- app/assets/stylesheets/bootstrap/mixins/_grid.scss
-- app/assets/stylesheets/bootstrap/mixins/_hide-text.scss
-- app/assets/stylesheets/bootstrap/mixins/_image.scss
-- app/assets/stylesheets/bootstrap/mixins/_labels.scss
-- app/assets/stylesheets/bootstrap/mixins/_list-group.scss
-- app/assets/stylesheets/bootstrap/mixins/_nav-divider.scss
-- app/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss
-- app/assets/stylesheets/bootstrap/mixins/_opacity.scss
-- app/assets/stylesheets/bootstrap/mixins/_pagination.scss
-- app/assets/stylesheets/bootstrap/mixins/_panels.scss
-- app/assets/stylesheets/bootstrap/mixins/_progress-bar.scss
-- app/assets/stylesheets/bootstrap/mixins/_reset-filter.scss
-- app/assets/stylesheets/bootstrap/mixins/_resize.scss
-- app/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss
-- app/assets/stylesheets/bootstrap/mixins/_size.scss
-- app/assets/stylesheets/bootstrap/mixins/_tab-focus.scss
-- app/assets/stylesheets/bootstrap/mixins/_table-row.scss
-- app/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
-- app/assets/stylesheets/bootstrap/mixins/_text-overflow.scss
-- app/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss
-- app/assets/stylesheets/dataclips/_bootstrap.scss
 - app/assets/stylesheets/dataclips/application.css
 - app/assets/stylesheets/dataclips/slickgrid/slickgrid.sass
 - app/controllers/dataclips/application_controller.rb
@@ -238,7 +164,7 @@ files:
 - app/views/dataclips/application/_integer.html.erb
 - app/views/dataclips/application/_text.html.erb
 - app/views/dataclips/application/_time.html.erb
-- app/views/dataclips/clips/edit.html.erb
+- app/views/dataclips/clips/require_variables.html.erb
 - app/views/dataclips/clips/show.html.erb
 - app/views/dataclips/insights/show.html.erb
 - app/views/layouts/dataclips/application.html.erb
@@ -346,3 +272,4 @@ test_files:
 - test/dummy/README.rdoc
 - test/integration/navigation_test.rb
 - test/test_helper.rb
+has_rdoc: