rack-push-notification 0.1.2 → 0.2.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    rack-push-notification (0.1.2)
-      bootstrap-sass (~> 2.1)
+    rack-push-notification (0.2.0)
+      bootstrap-sass (~> 2.1.0)
       coffee-script (~> 2.2)
       compass (~> 0.11)
       eco (~> 1.0)
@@ -25,7 +25,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
+    coffee-script-source (1.6.1)
     commander (4.1.3)
       highline (~> 1.6.11)
     compass (0.12.2)
@@ -39,31 +39,31 @@ GEM
     eco-source (1.1.0.rc.1)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    fssm (0.2.9)
-    haml (3.1.7)
+    fssm (0.2.10)
+    haml (3.1.8)
     highline (1.6.15)
     hike (1.2.1)
     houston (0.1.1)
       commander (~> 4.1.2)
       json (~> 1.7.3)
-    json (1.7.6)
-    multi_json (1.5.0)
-    rack (1.4.4)
+    json (1.7.7)
+    multi_json (1.6.1)
+    rack (1.5.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
-    rack-protection (1.3.2)
+    rack-protection (1.4.0)
       rack
     rake (0.9.2.2)
     rspec (0.6.4)
-    sass (3.2.5)
-    sequel (3.37.0)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
+    sass (3.2.6)
+    sequel (3.45.0)
+    sinatra (1.3.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
     sinatra-param (0.1.2)
       sinatra (~> 1.3)
-    sprockets (2.8.2)
+    sprockets (2.9.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -71,7 +71,7 @@ GEM
     sprockets-sass (0.9.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    tilt (1.3.3)
+    tilt (1.3.4)
 
 PLATFORMS
   ruby

data/lib/rack/push-notification/admin.rb

@@ -34,23 +34,34 @@ module Rack
 
     get '/devices/?' do
       param :q, String
-      param :offset, Integer, default: 0
-      param :limit, Integer, max: 100, min: 1, default: 25
-
-      @devices = ::Rack::PushNotification::Device.dataset
-      @devices = @devices.filter("tsv @@ to_tsquery('english', ?)", "#{params[:q]}:*") if params[:q] and not params[:q].empty?
-      
-      {
-        devices: @devices.limit(params[:limit], params[:offset]),
-        total: @devices.count
-      }.to_json
+
+      devices = ::Rack::PushNotification::Device.dataset
+      devices = devices.filter("tsv @@ to_tsquery('english', ?)", "#{params[:q]}:*") if params[:q] and not params[:q].empty?
+
+      if params[:page] or params[:per_page]
+        param :page, Integer, default: 1, min: 1
+        param :per_page, Integer, default: 100, in: (1..100)
+
+        {
+          devices: devices.limit(params[:per_page], (params[:page] - 1) * params[:per_page]),
+          page: params[:page],
+          total: klass.count
+        }.to_json
+      else
+        param :limit, Integer, default: 100, in: (1..100)
+        param :offset, Integer, default: 0, min: 0
+
+        {
+          devices: devices.limit(params[:limit], params[:offset])
+        }.to_json
+      end
     end
 
     get '/devices/:token/?' do
-      @record = ::Rack::PushNotification::Device.find(token: params[:token])
+      record = ::Rack::PushNotification::Device.find(token: params[:token])
 
-      if @record
-        @record.to_json
+      if record
+        {device: record}.to_json
       else
         status 404
       end

data/lib/rack/push-notification/assets/javascripts/collections/devices.coffee

@@ -22,6 +22,7 @@ class RPN.Collections.Devices extends Backbone.Paginator.requestPager
   parse: (response) ->
     @total = response.total
     @totalPages = Math.ceil(@total / @perPage)
+    console.log(response)
     response.devices
 
   comparator: (database) ->

data/lib/rack/push-notification/assets/javascripts/views/compose.coffee

@@ -27,12 +27,12 @@ class RPN.Views.Compose extends Backbone.View
     @updatePreview()
     @updateTime()
 
-    $.ajax "/message"
+    $.ajax("/message"
       type: "HEAD"
 
       error: (data, status) =>
         @disable()
-
+    )
     @
 
   submit: ->
@@ -44,13 +44,14 @@ class RPN.Views.Compose extends Backbone.View
     if $("input[name='recipients']:checked").val() == "specified"
       tokens = [$form.find("#tokens").val()]
 
-    $.ajax "/message"
+    $.ajax("/message"
       type: "POST"
       dataType: "json"
       data: {
         tokens: tokens,
         payload: payload
       }
+    )
       
       beforeSend: =>
         @$el.find(".alert-error, .alert-success").remove()

data/lib/rack/push-notification/assets/stylesheets/_codemirror.sass

@@ -170,8 +170,8 @@ div.CodeMirror span
   color: #839496
   div.CodeMirror-selected
     background: #586e75
-  .CodeMirror-gutter
-  .CodeMirror-gutter-text
+  .CodeMirror-gutter,
+  .CodeMirror-gutter-text,
   .CodeMirror-cursor
     border-left: 1px solid #839496
   span

data/lib/rack/push-notification/assets/stylesheets/screen.sass

@@ -3,7 +3,6 @@
 $btnPrimaryBackground: #f00
 @import "bootstrap"
 
-
 @mixin helvetica-font-stack
   font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif
 
@@ -19,7 +18,7 @@ html body
   -webkit-background-clip: padding-box
 
   & > header
-    @extend .navbar 
+    @extend .navbar
     @extend .navbar-static-top
 
     nav
@@ -33,8 +32,6 @@ html body
   & > header
     @extend .page-header
 
-    h1
-
     aside
       float: right
 
@@ -62,7 +59,7 @@ form#compose
 
     li
       @extend .control-group
-      
+
     input[type="radio"], label
       display: inline-block
 
@@ -83,7 +80,7 @@ form#compose
     clear: both
     width: 100%
     margin-top: 5em
-  
+
   button
     @extend .btn
     @extend .btn-large
@@ -107,5 +104,5 @@ form.filter
   margin-bottom: 0
 
   input[type="text"]
-    @extend .input-medium 
+    @extend .input-medium
     @extend .search-query

data/lib/rack/push-notification/device.rb

@@ -4,12 +4,10 @@ module Rack
   class PushNotification::Device < Sequel::Model
     self.dataset = :devices
 
-    Sequel::Migrator.run(self.db, ::File.join(::File.dirname(__FILE__), "migrations"))
-
     self.strict_param_setting = false
     self.raise_on_save_failure = false
 
-    plugin :json_serializer, naked: true, except: :id 
+    plugin :json_serializer, naked: true
     plugin :validation_helpers
     plugin :timestamps, force: true
     plugin :schema
@@ -29,5 +27,7 @@ module Rack
     def normalize_token!
       self.token = self.token.strip.gsub(/[<\s>]/, '')
     end
+
+    Sequel::Migrator.run(self.db, ::File.join(::File.dirname(__FILE__), "migrations")) rescue false
   end
 end

data/lib/rack/push-notification/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class PushNotification
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

data/lib/rack/push-notification.rb

@@ -26,14 +26,14 @@ module Rack
       param :languages, Array
       param :tags, Array
 
-      @record = Device.find(token: params[:token]) || Device.new
-      @record.set(params)
+      record = Device.find(token: params[:token]) || Device.new
+      record.set(params)
 
-      code = @record.new? ? 201 : 200
+      code = record.new? ? 201 : 200
 
-      if @record.save
+      if record.save
         status code
-        @record.to_json
+        {device: record}.to_json
       else
         status 406
         {errors: @record.errors}.to_json

data/rack-push-notification.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "eco", "~> 1.0"
   s.add_dependency "haml", "~> 3.1"
   s.add_dependency "sass", "~> 3.2"
-  s.add_dependency "bootstrap-sass", "~> 2.1"
+  s.add_dependency "bootstrap-sass", "~> 2.1.0"
   s.add_dependency "compass", "~> 0.11"
   s.add_dependency "sprockets", "~> 2.8"
   s.add_dependency "sprockets-sass", "~> 0.9"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-push-notification
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70327362806500 !ruby/object:Gem::Requirement
+  requirement: &70243365178400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70327362806500
+  version_requirements: *70243365178400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70327362806000 !ruby/object:Gem::Requirement
+  requirement: &70243365177680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70327362806000
+  version_requirements: *70243365177680
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70327362805540 !ruby/object:Gem::Requirement
+  requirement: &70243365176960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70327362805540
+  version_requirements: *70243365176960
 - !ruby/object:Gem::Dependency
   name: rack-contrib
-  requirement: &70327362805080 !ruby/object:Gem::Requirement
+  requirement: &70243365176280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70327362805080
+  version_requirements: *70243365176280
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70327362804620 !ruby/object:Gem::Requirement
+  requirement: &70243365175480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.37'
   type: :runtime
   prerelease: false
-  version_requirements: *70327362804620
+  version_requirements: *70243365175480
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70327362804160 !ruby/object:Gem::Requirement
+  requirement: &70243365174540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70327362804160
+  version_requirements: *70243365174540
 - !ruby/object:Gem::Dependency
   name: sinatra-param
-  requirement: &70327362803700 !ruby/object:Gem::Requirement
+  requirement: &70243365173800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70327362803700
+  version_requirements: *70243365173800
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70327362803240 !ruby/object:Gem::Requirement
+  requirement: &70243365173320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70327362803240
+  version_requirements: *70243365173320
 - !ruby/object:Gem::Dependency
   name: eco
-  requirement: &70327362802760 !ruby/object:Gem::Requirement
+  requirement: &70243365172840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70327362802760
+  version_requirements: *70243365172840
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70327362802300 !ruby/object:Gem::Requirement
+  requirement: &70243365172340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70327362802300
+  version_requirements: *70243365172340
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70327362801840 !ruby/object:Gem::Requirement
+  requirement: &70243365171860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,21 +131,21 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70327362801840
+  version_requirements: *70243365171860
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
-  requirement: &70327362801380 !ruby/object:Gem::Requirement
+  requirement: &70243365171380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70327362801380
+  version_requirements: *70243365171380
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70327362800920 !ruby/object:Gem::Requirement
+  requirement: &70243365170900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '0.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70327362800920
+  version_requirements: *70243365170900
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70327362800460 !ruby/object:Gem::Requirement
+  requirement: &70243365170440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70327362800460
+  version_requirements: *70243365170440
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
-  requirement: &70327362800000 !ruby/object:Gem::Requirement
+  requirement: &70243365169980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70327362800000
+  version_requirements: *70243365169980
 - !ruby/object:Gem::Dependency
   name: houston
-  requirement: &70327362799540 !ruby/object:Gem::Requirement
+  requirement: &70243365169520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,7 +186,7 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70327362799540
+  version_requirements: *70243365169520
 description: Generate a REST API for registering and querying push notification device
   tokens.
 email: m@mattt.me
@@ -228,8 +228,6 @@ files:
 - ./lib/rack/push-notification/version.rb
 - ./lib/rack/push-notification.rb
 - ./LICENSE
-- ./rack-push-notification-0.1.0.gem
-- ./rack-push-notification-0.1.1.gem
 - ./rack-push-notification.gemspec
 - ./Rakefile
 - ./README.md
@@ -247,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2419482738763005983
+      hash: -324249567493366905
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -256,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2419482738763005983
+      hash: -324249567493366905
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15