lurker 0.5.3 → 0.5.4

data/lib/lurker/templates/stylesheets/application.css

@@ -1,8 +1,6 @@
 /*
  *= require bootstrap
  *= require font-awesome/css/font-awesome
- *= require plugins/morris/morris-0.4.3.min
- *= require plugins/timeline/timeline
  *= require sb-admin
  *
  *= require prettify

data/lib/lurker/version.rb

@@ -1,3 +1,3 @@
 module Lurker
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/lurker.gemspec

@@ -28,12 +28,13 @@ Gem::Specification.new do |spec|
   # testing
   spec.add_development_dependency("psych", "~> 2.0")
   spec.add_development_dependency("bundler", "~> 1.3")
-  spec.add_development_dependency("rails", "~> 4.1")
+  spec.add_development_dependency("rails", '>= 3.2', '< 4.2')
   spec.add_development_dependency("rake", "~> 10.2")
   spec.add_development_dependency("rspec", "~> 2.14")
   spec.add_development_dependency("cucumber", "~> 1.3")
   spec.add_development_dependency("aruba", "~> 0.5")
   spec.add_development_dependency("capybara", "~> 2.2")
+  spec.add_development_dependency("nokogiri", "~> 1.5.11")
   spec.add_development_dependency("poltergeist", "~> 1.5")
   spec.add_development_dependency("database_cleaner", "~> 1.2")
 

data/templates/generate_stuff.rb

@@ -1,14 +1,49 @@
 # gsub_file 'config/database.yml', /database: lurker_app.*/, 'database: lurker_app'
-create_link "bin/lurker", "#{File.expand_path '../../bin/lurker', __FILE__}"
+# comment_lines 'config/database.yml', /username|password/
+file 'config/database.yml', force: true do
+  <<-CODE
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  database: lurker_app
+  pool: 5
+test:
+  <<: *default
+  database: lurker_app_test
+development:
+  <<: *default
+production:
+  url: <%= ENV['DATABASE_URL'] %>
+  CODE
+end
+
+copy_file "#{File.expand_path '../../bin/lurker', __FILE__}", "bin/lurker"
+inject_into_file "bin/lurker", before: /require .lurker.$/ do
+  <<-CODE
+    if (simplecov_root = ENV['SIMPLECOV_ROOT']) && (simplecov_cmdname = ENV['SIMPLECOV_CMDNAME'])
+      require 'simplecov'
+      SimpleCov.start
+      SimpleCov.root simplecov_root
+      SimpleCov.command_name "\#{simplecov_cmdname}-binstub"
+      SimpleCov.start do
+        filters.clear # This will remove the :root_filter that comes via simplecov's defaults
+        add_filter do |src|
+          !(src.filename =~ /^\#{SimpleCov.root}\\/lib\\/lurker/)
+        end
+      end
+    end
+  CODE
+end
+chmod "bin/lurker", 0755
 
 remove_file 'spec/spec_helper.rb'
 remove_file 'app/models/user.rb'
 
 generate 'rspec:install'
-generate 'model User name:string --no-timestamps --no-test-framework'
-generate 'model Repo user:references name:string --no-timestamps --no-test-framework'
 
 route <<-ROUTE
+  mount Lurker::Server.to_rack(path: 'html'), at: "/#{Lurker::DEFAULT_URL_BASE}"
+
   namespace :api do
     namespace :v1 do
       resources :users do
@@ -20,13 +55,47 @@ route <<-ROUTE
   root to: redirect('/lurker')
 ROUTE
 
+generate 'model User name:string --no-timestamps --no-test-framework --no-migration'
+generate 'model Repo user:references name:string --no-timestamps --no-test-framework --no-migration'
+
+file 'config/initializers/serializer.rb', force: true do
+  <<-CODE
+    module ExactOrderAsJson
+      # we need EXACT order for json attributes generation (e.g. rails32 sorts it)
+      # see: https://github.com/rails/rails/pull/5678/files
+      #
+      # options[:only] gets ordered like `attributes.keys` (via &=)
+      # attributes order is also inconsistent, so use options[:methods]
+      def as_json(options={})
+        methods = options[:methods] || []
+        if options[:only]
+          options[:methods] = Array.wrap(options[:only]).sort + methods
+        else
+          options[:methods] = attributes.keys.sort + methods
+        end
+        options[:only] = []
+
+        super(options)
+      end
+    end
+  CODE
+end
+
 inject_into_class 'app/models/user.rb', 'User' do
   <<-CODE
+    include ExactOrderAsJson
     has_many :repos
     validates :name, presence: true
   CODE
 end
 
+inject_into_class 'app/models/repo.rb', 'Repo' do
+  <<-CODE
+    include ExactOrderAsJson
+    validates :name, presence: true
+  CODE
+end
+
 file 'app/controllers/application_controller.rb', 'ApplicationController', force: true do
   <<-CODE
     class ApplicationController < ActionController::Base
@@ -38,6 +107,14 @@ file 'app/controllers/application_controller.rb', 'ApplicationController', force
       def set_format
         request.format = :json
       end
+
+      def scoped(klass)
+        if klass.respond_to?(:scoped) # Rails3
+          klass.scoped
+        else
+          klass.all
+        end
+      end
     end
   CODE
 end
@@ -46,7 +123,7 @@ file 'app/controllers/api/v1/users_controller.rb', 'Api::V1::UsersController', f
   <<-CODE
     class Api::V1::UsersController < ApplicationController
       def index
-        @users = User.all
+        @users = scoped(User)
         if (limit = params[:limit]).to_s.match(/\\d+/)
           @users = @users.limit(limit.to_i)
         end
@@ -58,15 +135,15 @@ file 'app/controllers/api/v1/users_controller.rb', 'Api::V1::UsersController', f
         if @user.save
           render json: @user
         else
-          render json: { errors: @user.errors }
+          render json: { errors: @user.errors }, status: :bad_request
         end
       end
 
       def update
-        if user.update(user_params)
+        if user.update_attributes(user_params)
           render json: user
         else
-          render json: { errors: user.errors }
+          render json: { errors: user.errors }, status: :bad_request
         end
       end
 
@@ -114,20 +191,20 @@ file 'app/controllers/api/v1/repos_controller.rb', 'Api::V1::ReposController', f
         if @repo.save
           render json: @repo.to_json(include: 'user', except: 'user_id')
         else
-          render json: { errors: @repo.errors }, status: 401
+          render json: { errors: @repo.errors }, status: :bad_request
         end
       end
 
       def show
-        render json: Repo.find(params[:id])
+        render json: repo
       end
 
       def update
-        @repo = user.repos.find(params[:id])
-        if @repo.update(repo_params)
+        @repo = repo
+        if @repo.update_attributes(repo_params)
           render json: @repo
         else
-          render json: { errors: @repo.errors }
+          render json: { errors: @repo.errors }, status: :bad_request
         end
       end
 
@@ -139,6 +216,10 @@ file 'app/controllers/api/v1/repos_controller.rb', 'Api::V1::ReposController', f
 
       private
 
+      def repo
+        @repo ||= (user.repos.find_by_name(params[:id]) || user.repos.find(params[:id]))
+      end
+
       def user
         @user ||= (User.find_by_name(params[:user_id]) || User.find(params[:user_id]))
       end
@@ -224,20 +305,28 @@ file 'lib/tasks/db.rake', force: true do
     namespace :db do
       desc 'fills in data'
       task :import => :environment do
-        User.find_or_create_by!(name: "razum2um").repos.find_or_create_by!(name: "lurker")
-        User.find_or_create_by!(name: "razum2um").repos.find_or_create_by!(name: "resque-kalashnikov")
-        User.find_or_create_by!(name: "razum2um").repos.find_or_create_by!(name: "mutli_schema")
+        User.where(name: "razum2um").first_or_create.repos.where(name: "lurker").first_or_create
+        User.where(name: "razum2um").first_or_create.repos.where(name: "resque-kalashnikov").first_or_create
+        User.where(name: "razum2um").first_or_create.repos.where(name: "mutli_schema").first_or_create
       end
     end
   CODE
 end
 
-run 'bin/rake db:drop'
-run 'bin/rake db:create'
-run 'bin/rake db:migrate'
-run 'bin/rake db:import'
+file 'db/schema.rb', force: true do
+  <<-CODE
+    ActiveRecord::Schema.define do
+      create_table "repos", :force => true do |t|
+        t.integer "user_id"
+        t.string  "name"
+      end
 
-run 'RAILS_ENV=test bin/rake db:drop'
-run 'RAILS_ENV=test bin/rake db:create'
-run 'RAILS_ENV=test bin/rake db:migrate'
+      add_index "repos", ["user_id"], :name => "index_repos_on_user_id"
+
+      create_table "users", :force => true do |t|
+        t.string "name"
+      end
+    end
+  CODE
+end
 

data/templates/lurker_app.rb

@@ -1,8 +1,3 @@
-file '.bundle/config', <<-CODE
----
-BUNDLE_PATH: #{File.expand_path '../../vendor/bundle', __FILE__}
-CODE
-
 gem 'rspec-rails'
 gem 'spring-commands-rspec'
 gem 'database_cleaner'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lurker
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Vlad Bokov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -126,16 +126,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +212,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.11
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -304,7 +324,6 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.ci
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -322,8 +341,12 @@ files:
 - features/request_specs/nested_schema_scaffolding.feature
 - features/request_specs/readme.md
 - features/request_specs/schema_scaffolding.feature
+- features/request_specs/schema_suffixes.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
+- gemfiles/Gemfile32.ci
+- gemfiles/Gemfile40.ci
+- gemfiles/Gemfile41.ci
 - lib/endpoint-schema.yaml
 - lib/lurker.rb
 - lib/lurker/capistrano.rb
@@ -335,11 +358,9 @@ files:
 - lib/lurker/erb_schema_context.rb
 - lib/lurker/form_builder.rb
 - lib/lurker/jaml_descriptor.rb
-- lib/lurker/meta_service.rb
 - lib/lurker/presenters/base_presenter.rb
 - lib/lurker/presenters/endpoint_presenter.rb
 - lib/lurker/presenters/json_presenter.rb
-- lib/lurker/presenters/meta_service_presenter.rb
 - lib/lurker/presenters/response_code_presenter.rb
 - lib/lurker/presenters/schema_presenter.rb
 - lib/lurker/presenters/service_presenter.rb
@@ -353,8 +374,6 @@ files:
 - lib/lurker/spec_watcher.rb
 - lib/lurker/tasks/capistrano.rake
 - lib/lurker/templates/bootstrap.css.map
-- lib/lurker/templates/endpoint.html.erb
-- lib/lurker/templates/endpoint.md.erb
 - lib/lurker/templates/fonts/FontAwesome.otf
 - lib/lurker/templates/fonts/fontawesome-webfont.eot
 - lib/lurker/templates/fonts/fontawesome-webfont.svg
@@ -366,21 +385,9 @@ files:
 - lib/lurker/templates/fonts/glyphicons-halflings-regular.woff
 - lib/lurker/templates/javascripts/JSXTransformer.js
 - lib/lurker/templates/javascripts/application.js
-- lib/lurker/templates/javascripts/demo/dashboard-demo.js
-- lib/lurker/templates/javascripts/demo/flot-demo.js
-- lib/lurker/templates/javascripts/demo/morris-demo.js
 - lib/lurker/templates/javascripts/lurker.js
 - lib/lurker/templates/javascripts/phantomjs-shims.js
-- lib/lurker/templates/javascripts/plugins/dataTables/dataTables.bootstrap.js
-- lib/lurker/templates/javascripts/plugins/dataTables/jquery.dataTables.js
-- lib/lurker/templates/javascripts/plugins/flot/excanvas.min.js
-- lib/lurker/templates/javascripts/plugins/flot/jquery.flot.js
-- lib/lurker/templates/javascripts/plugins/flot/jquery.flot.pie.js
-- lib/lurker/templates/javascripts/plugins/flot/jquery.flot.resize.js
-- lib/lurker/templates/javascripts/plugins/flot/jquery.flot.tooltip.min.js
 - lib/lurker/templates/javascripts/plugins/metisMenu/jquery.metisMenu.js
-- lib/lurker/templates/javascripts/plugins/morris/morris.js
-- lib/lurker/templates/javascripts/plugins/morris/raphael-2.1.0.min.js
 - lib/lurker/templates/javascripts/prettify.js
 - lib/lurker/templates/javascripts/react-catalyst.js
 - lib/lurker/templates/javascripts/react-with-addons.js
@@ -390,7 +397,6 @@ files:
 - lib/lurker/templates/layouts/_sidesearch.html.erb
 - lib/lurker/templates/layouts/application.html.erb
 - lib/lurker/templates/lurker/rendering/_breadcrumb.html.erb
-- lib/lurker/templates/lurker/rendering/_endpoint.html.erb
 - lib/lurker/templates/lurker/rendering/_information_warning_li.html.erb
 - lib/lurker/templates/lurker/rendering/_left_menu.html.erb
 - lib/lurker/templates/lurker/rendering/_param_form_element.html.erb
@@ -400,7 +406,6 @@ files:
 - lib/lurker/templates/lurker/rendering/_undefined_route.html.erb
 - lib/lurker/templates/lurker/rendering/index.html.erb
 - lib/lurker/templates/lurker/rendering/show.html.erb
-- lib/lurker/templates/meta_service.html.erb
 - lib/lurker/templates/meta_service.md.erb
 - lib/lurker/templates/public/application.css
 - lib/lurker/templates/public/application.js
@@ -414,18 +419,11 @@ files:
 - lib/lurker/templates/public/fonts/glyphicons-halflings-regular.svg
 - lib/lurker/templates/public/fonts/glyphicons-halflings-regular.ttf
 - lib/lurker/templates/public/fonts/glyphicons-halflings-regular.woff
-- lib/lurker/templates/service.html.erb
-- lib/lurker/templates/service.md.erb
 - lib/lurker/templates/shared/endpoint_name.html.erb
 - lib/lurker/templates/shared/endpoint_name.md.erb
-- lib/lurker/templates/styles.css
 - lib/lurker/templates/stylesheets/application.css
 - lib/lurker/templates/stylesheets/bootstrap.css
 - lib/lurker/templates/stylesheets/font-awesome/css/font-awesome.css
-- lib/lurker/templates/stylesheets/plugins/dataTables/dataTables.bootstrap.css
-- lib/lurker/templates/stylesheets/plugins/morris/morris-0.4.3.min.css
-- lib/lurker/templates/stylesheets/plugins/social-buttons/social-buttons.css
-- lib/lurker/templates/stylesheets/plugins/timeline/timeline.css
 - lib/lurker/templates/stylesheets/prettify-desert.css
 - lib/lurker/templates/stylesheets/prettify.css
 - lib/lurker/templates/stylesheets/sb-admin.css
@@ -475,6 +473,7 @@ test_files:
 - features/request_specs/nested_schema_scaffolding.feature
 - features/request_specs/readme.md
 - features/request_specs/schema_scaffolding.feature
+- features/request_specs/schema_suffixes.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
 - spec/lurker/endpoint_spec.rb

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG v1
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABCgAGBQJTYSdDAAoJENcoxKfNVdjbTd0H/ikPlNf2LUQtakmpxDMxCZKo
-iT3v87Ssz07yZcgt8wZDF64rVBZZ1yM2bssQftCLOvVqKGzXzlemwp7dO4m2hcBE
-8QoeueyTieMo9gN+p2/sNk3RaMwsUy4X24Q1ZSUdBiez/K8QPnjSnSeReVHBwI3X
-GDag9EdC+i79eTM+/06Ab5ReY4Wxn7w5pxRATWFrv4s0r3yElaOaARQQbH2RLe66
-KCkKSmh6QVG3f08rRkvnXyx0CbpQqSIxz6jN696z1PfeWecRBs9LYfxRSM/0BgCW
-KDSFDju69n2mNdGKNsOIicpguq8RNlG+7o3JzYyPru/4qEZfDS4uFsnZIuPxSfE=
-=kKPC
+iQEcBAABCgAGBQJTaesfAAoJENcoxKfNVdjbgroIANLWxjOTNAIIaj4XzR6jJzfv
+CVWJ5D2BOqOOq5F6gU5fGJsvpaMVfNY/NcVj5sXSzFI/PBs136EVMNgyJNOEVhTa
+KyjRiplG/LYgvBjGkuWuuv3KSTLbOcH3kRCKmzeJOZftCeUtS09YNX9+RrGlMFyE
+oCH05lp3VPHyTFQ6fo1l+c+9EBe8SzoEFy8Qpzizw+tIGx2GaKxp98Kc1NGw/4Ak
+zJmnEno9iCjXAAqhl7JmGAMj0oB1lZ3v2OCgkC614BMdSQ4NxvoNojQuKxB3Lbc1
+VVibMrzBXEN2vHROLvgQ9SIb9+POxdbc8bpS7oM5CO1wBZVANNurjfWVFr1RwZM=
+=o0r3
 -----END PGP SIGNATURE-----

data/lib/lurker/meta_service.rb

@@ -1,46 +0,0 @@
-require 'yaml'
-
-# MetaServices are collections of services
-class Lurker::MetaService
-  attr_reader :meta_service_dir
-
-  def initialize(meta_service_dir)
-    @meta_service_dir = File.expand_path(meta_service_dir)
-
-    service_path = Dir["#{meta_service_dir}/*.lurker.meta"].first
-    @schema = if service_path
-      YAML.load_file(service_path)
-    else
-      {}
-    end
-  end
-
-  def empty?
-    @schema.empty?
-  end
-
-  def services
-    @schema['services'].map do |path|
-      service_path = if path.start_with?('/') || path.start_with?('~')
-        path
-      else
-        File.join(meta_service_dir, path)
-      end
-      serv = Lurker::Service.new(service_path)
-      serv.meta_service = self
-      serv
-    end
-  end
-
-  def name
-    @schema['name']
-  end
-
-  def description
-    @schema['description']
-  end
-
-  def discussion
-    @schema['discussion']
-  end
-end