feedcellar-web 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3f80fe7f495bd7dc4e8de22632da3288e96fa8
-  data.tar.gz: 511962c1a955ae422f4afe4fb57a4ab9d009f5b0
+  metadata.gz: 4e59c602c1a93b977060a29b050cd40e6d66b9a2
+  data.tar.gz: 13c6dcf680bafcd1d50c5e8b242c3293a65db9b6
 SHA512:
-  metadata.gz: 625f5a92ea8e40d69a051540b95f94f8b5446492195c32b10c2a80b072ba3b677d9ecc4b5614c850b002851e4e0aa12b21656bc09b294f704b75b2dbe9d15a84
-  data.tar.gz: 2e453adc110ee6cd6fca2c09e05f2ca65b1b752b7d2802aa2c07171ad3dd7fee9d9459927a855307d103e965f5d172df9ac357d5c02f261dd83752d2bc9e4d4b
+  metadata.gz: e1ddc14f72b6d5842f13b403de0f3fbfb0c31f7a6e5fb1ce553bcfebf61419684c339334cf04ed23b7c01d786236bb91cd6ab99a51ef2c9e548d71ec7231122d
+  data.tar.gz: cc02710a77ca9d3ac9f69cace3d65896f5ca3aac232f321cca1137857e67ba094c2431d489c9b78f8c9d78c6cd0615b5799902861477a51520e3bcfd37f5bb78

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    feedcellar-web (0.3.1)
+    feedcellar-web (0.3.2)
       feedcellar (>= 0.6.0)
       haml
       kaminari
@@ -9,6 +9,8 @@ PATH
       padrino-helpers
       racknga
       sinatra
+      sinatra-contrib
+      sinatra-cross_origin
       thor
 
 GEM
@@ -36,13 +38,14 @@ GEM
     addressable (2.3.8)
     archive-zip (0.7.0)
       io-like (~> 0.3.0)
+    backports (3.6.4)
     builder (3.2.2)
     erubis (2.7.0)
     feedcellar (0.6.0)
       rroonga (>= 5.0.0)
       thor
     gqtp (1.0.6)
-    groonga-client (0.1.0)
+    groonga-client (0.1.6)
       gqtp (>= 1.0.4)
       groonga-command (>= 1.0.8)
     groonga-command (1.1.2)
@@ -51,16 +54,17 @@ GEM
       tilt
     i18n (0.7.0)
     io-like (0.3.0)
-    json (1.8.2)
+    json (1.8.3)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.1)
+    loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mini_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.7.0)
+    multi_json (1.11.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     padrino-helpers (0.12.5)
@@ -71,7 +75,7 @@ GEM
       activesupport (>= 3.1)
     pkg-config (1.1.6)
     power_assert (0.2.3)
-    rack (1.6.0)
+    rack (1.6.1)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
@@ -89,7 +93,7 @@ GEM
       loofah (~> 2.0)
     rake (10.4.2)
     rr (1.1.2)
-    rroonga (5.0.0)
+    rroonga (5.0.3)
       archive-zip
       groonga-client (>= 0.0.3)
       json
@@ -98,7 +102,15 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    test-unit (3.0.9)
+    sinatra-contrib (1.4.4)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    sinatra-cross_origin (0.3.2)
+    test-unit (3.1.2)
       power_assert
     test-unit-notify (1.0.4)
       test-unit (>= 2.4.9)

data/NEWS.md

@@ -1,5 +1,18 @@
 # NEWS
 
+## 0.4.0: 2016-02-17
+
+### Changes
+
+#### Improvements
+
+* Add space between resources and years.
+* Break by years.
+* Break by months by years.
+* Added /search.json route.
+* Supported CORS.
+* Don't paginate unless params[:page] is specified.
+
 ## 0.3.1: 2015-04-13
 
 Bug fix release for 0.3.0.

data/feedcellar-web.gemspec

@@ -40,6 +40,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("feedcellar", ">= 0.6.0")
   spec.add_runtime_dependency("thor")
   spec.add_runtime_dependency("sinatra")
+  spec.add_runtime_dependency("sinatra-contrib")
+  spec.add_runtime_dependency("sinatra-cross_origin")
   spec.add_runtime_dependency("padrino-helpers")
   spec.add_runtime_dependency("kaminari")
   spec.add_runtime_dependency("haml")

data/lib/feedcellar/web/app.rb

@@ -18,6 +18,8 @@
 
 require "feedcellar"
 require "sinatra/base"
+require "sinatra/json"
+require "sinatra/cross_origin"
 require "haml"
 require "padrino-helpers"
 require "kaminari/sinatra"
@@ -26,30 +28,24 @@ module Feedcellar
   module Web
     class App < Sinatra::Base
       helpers Kaminari::Helpers::SinatraHelpers
+      register Sinatra::CrossOrigin
 
       get "/" do
         haml :index
       end
 
       get "/search" do
-        if params[:word]
-          words = params[:word].split(" ")
-        else
-          words = []
-        end
-        options ||= {}
-        options[:resource_id] = params[:resource_id] if params[:resource_id]
-        options[:year] = params[:year].to_i if params[:year]
-        options[:month] = params[:month].to_i if params[:month]
-        @feeds = search(words, options)
-        if @feeds
-          page = params[:page]
-          n_per_page = options[:n_per_page] || 50
-          @paginated_feeds = pagenate_feeds(@feeds, page, n_per_page)
-        end
+        search_and_paginate
         haml :index
       end
 
+      get "/search.json" do
+        cross_origin
+        search_and_paginate
+        feeds = @paginated_feeds || @feeds
+        json feeds.collect {|feed| feed.attributes }
+      end
+
       get "/registers.opml" do
         content_type :xml
         opml = nil
@@ -60,6 +56,24 @@ module Feedcellar
       end
 
       helpers do
+        def search_and_paginate
+          if params[:word]
+            words = params[:word].split(" ")
+          else
+            words = []
+          end
+          options ||= {}
+          options[:resource_id] = params[:resource_id] if params[:resource_id]
+          options[:year] = params[:year].to_i if params[:year]
+          options[:month] = params[:month].to_i if params[:month]
+          @feeds = search(words, options)
+          if @feeds and params[:page]
+            page = params[:page]
+            n_per_page = options[:n_per_page] || 50
+            @paginated_feeds = pagenate_feeds(@feeds, page, n_per_page)
+          end
+        end
+
         def search(words, options={})
           database = GroongaDatabase.new
           database.open(Command.new.database_dir)

data/lib/feedcellar/web/version.rb

@@ -1,6 +1,6 @@
 # constant Feedcellar::Web::VERSION
 #
-# Copyright (C) 2015  Masafumi Yokoyama <myokoym@gmail.com>
+# Copyright (C) 2015-2016  Masafumi Yokoyama <myokoym@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,6 +18,6 @@
 
 module Feedcellar
   module Web
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/lib/feedcellar/web/views/_feeds.haml

@@ -1,8 +1,10 @@
-= paginate(@paginated_feeds)
+- if @paginated_feeds
+  = paginate(@paginated_feeds)
 %ul
-  - @paginated_feeds.each do |feed|
+  - (@paginated_feeds || @feeds).each do |feed|
     %li
       %p
         = feed.date.strftime("%Y-%m-%d")
         = link_to("#{feed.title} - #{feed.resource.title}", feed.link)
-= paginate(@paginated_feeds)
+- if @paginated_feeds
+  = paginate(@paginated_feeds)

data/lib/feedcellar/web/views/_months_by_years.haml

@@ -4,3 +4,4 @@
   - month = sub_record.month
   = link_to("#{"%04d" % year}-#{"%02d" % month} (#{group.n_sub_records})",
             url("/search?word=#{params[:word]}&year=#{year}&month=#{month}"))
+  %br

data/lib/feedcellar/web/views/_years.haml

@@ -2,3 +2,4 @@
   - year = group.key
   = link_to("#{"%04d" % year} (#{group.n_sub_records})",
             url("/search?word=#{params[:word]}&year=#{year}"))
+  %br

data/lib/feedcellar/web/views/index.haml

@@ -7,7 +7,8 @@
       .col-sm-6
         = render :_feeds, layout: false
       .col-sm-4
-        = render :_resources, layout: false
+        %p
+          = render :_resources, layout: false
       .col-sm-2
         %p
           = render :_years, layout: false

data/test/test-app.rb

@@ -11,4 +11,19 @@ class AppTest < Test::Unit::TestCase
     get "/"
     assert_true(last_response.ok?)
   end
+
+  def test_search
+    get "/search"
+    assert_true(last_response.ok?)
+  end
+
+  def test_search_json
+    get "/search.json"
+    assert_true(last_response.ok?)
+  end
+
+  def test_registers
+    get "/registers.opml"
+    assert_true(last_response.ok?)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedcellar-web
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: feedcellar
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  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: sinatra-cross_origin
+  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: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Web interface for Feedcellar
@@ -270,3 +298,4 @@ test_files:
 - test/run-test.rb
 - test/test-app.rb
 - test/test-command.rb
+has_rdoc: