daily 0.0.3 → 0.0.4

data/app/views/main/home.erb

@@ -1,4 +1,4 @@
 <% title "Welcome #{current_user.email}" %>
 <%= content_tag(:p, link_to("Update Account", account_path)) if permitted_to? :account, current_user %>
 
-<%= render 'users/items', :user => current_user %>
+<%= render 'daily_users/items', :user => current_user %>

data/config/authorization_rules.rb

@@ -4,39 +4,39 @@ authorization do
   end
   
   role :user do
-    has_permission_on :tables, :to => [:create]
-    has_permission_on :tables, :to => [:show]
+    has_permission_on :daily_tables, :to => [:create]
+    has_permission_on :daily_tables, :to => [:show]
     
-    has_permission_on :tables, :to => [:update] do
+    has_permission_on :daily_tables, :to => [:update] do
       if_attribute :user => is { user }
     end
     
-    has_permission_on :tables, :to => [:report] do
+    has_permission_on :daily_tables, :to => [:report] do
       if_permitted_to :show
     end
     
-    has_permission_on :reports, :to => [:create] do
+    has_permission_on :daily_reports, :to => [:create] do
       if_permitted_to :report, :table
     end
     
-    has_permission_on :reports, :to => [:update] do
+    has_permission_on :daily_reports, :to => [:update] do
       if_attribute :user => is { user }
     end
     
-    has_permission_on :reports, :to => [:show, :generate] do
+    has_permission_on :daily_reports, :to => [:show, :generate] do
       if_permitted_to :update
     end
     
-    has_permission_on :users, :to => [:update, :account] do
+    has_permission_on :daily_users, :to => [:update, :account] do
       if_attribute :id => is { user.id }
     end
     
   end
   
   role :admin do
-    has_permission_on :tables, :to => :manage
-    has_permission_on :reports, :to => :manage
-    has_permission_on :users, :to => :manage
+    has_permission_on :daily_tables, :to => :manage
+    has_permission_on :daily_reports, :to => :manage
+    has_permission_on :daily_users, :to => :manage
   end
 end
 

data/config/initializers/ruport.rb

@@ -1,5 +1,4 @@
 DailyConfig.database_init
 
-Dir[Rails.root.join("app/formatters/*")].each { |f| require f }
-Dir[Rails.root.join("app/transforms/*")].each { |f| require f }
+DailyConfig.load_classes
                          

data/config/locales/en.yml

@@ -2,4 +2,30 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  hello: "Hello world"
+  helpers:
+    submit:
+      daily_user:
+        create: "Create User"
+        update: "Update User"
+      daily_report:
+        create: "Create Report"
+        update: "Update Report"
+      daily_table:
+        create: "Create Table"
+        update: "Update Table"
+  flash:
+    daily_users:
+      create:
+        notice: "User was successfully created."
+      update:
+        notice: "User was successfully updated."
+    daily_reports:
+      create:
+        notice: "Report was successfully created."
+      update:
+        notice: "Report was successfully updated."
+    daily_tables:
+      create:
+        notice: "Table was successfully created."
+      update:
+        notice: "Table was successfully updated."

data/config/routes.rb

@@ -2,7 +2,7 @@ Rails.application.routes.draw do
   
   scope "/#{DailyConfig.subdirectory}" do
     
-    devise_for :users, :only => :sessions do
+    devise_for :users, :only => :sessions, :class_name => "DailyUser" do
       get "login", :to => "devise/sessions#new"
       get "logout", :to => "devise/sessions#destroy"
       root :to => "devise/sessions#new"
@@ -10,18 +10,18 @@ Rails.application.routes.draw do
   
     match 'home' => 'main#home', :as => :user_root
   
-    resources :tables do
-      resources :reports do
+    resources :daily_tables, :path => "tables" do
+      resources :daily_reports, :path => "reports" do
         member do
           post :generate
         end
       end
     end
   
-    resources :reports, :only => :index
+    resources :daily_reports, :path => "reports", :only => :index
   
-    resources :users
-    get "account", :to => "users#edit"
+    resources :daily_users, :path => "users"
+    get "account", :to => "daily_users#edit"
     
     get "files/*path", :to => "files#show", :format => false
   end

data/db/migrate/20120111054115_create_table_metrics.rb

@@ -0,0 +1,42 @@
+class CreateTableMetrics < ActiveRecord::Migration
+  module Migration
+    class Table < ActiveRecord::Base
+      def self.migrate(up)
+        find_in_batches do |batch|
+          batch.each do |t|
+            if up
+              t.up
+            else
+              t.down
+            end
+            t.save!
+          end
+        end
+      end
+
+      def self.record_timestamps
+        # don't update updated_at stamp
+        false
+      end
+
+      def up
+        self.metric = "SqlQuery" if self.metric == "sql"
+      end
+
+      def down
+        self.metric = "sql" if self.metric == "SqlQuery"
+      end
+    end
+  end
+  def self.up
+    rename_column :tables, :data_type, :metric
+    rename_column :tables, :data, :metric_data
+    Migration::Table.migrate(true)
+  end
+
+  def self.down
+    Migration::Table.migrate(false)
+    rename_column :tables, :metric_data, :data
+    rename_column :tables, :metric, :data_type
+  end
+end

data/db/migrate/20120111081745_namespace_models.rb

@@ -0,0 +1,13 @@
+class NamespaceModels < ActiveRecord::Migration
+  def self.up
+    rename_table :users, :daily_users
+    rename_table :reports, :daily_reports
+    rename_table :tables, :daily_tables
+  end
+
+  def self.down
+    rename_table :daily_tables, :tables
+    rename_table :daily_reports, :reports
+    rename_table :daily_users, :users
+  end
+end

data/db/schema.rb

@@ -10,26 +10,9 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111214020029) do
+ActiveRecord::Schema.define(:version => 20120111081745) do
 
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0
-    t.integer  "attempts",   :default => 0
-    t.text     "handler"
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "report_id"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-  add_index "delayed_jobs", ["report_id"], :name => "index_delayed_jobs_on_report_id"
-
-  create_table "reports", :force => true do |t|
+  create_table "daily_reports", :force => true do |t|
     t.string   "name"
     t.string   "filename"
     t.integer  "table_id"
@@ -44,10 +27,10 @@ ActiveRecord::Schema.define(:version => 20111214020029) do
     t.text     "formatter_data"
   end
 
-  create_table "tables", :force => true do |t|
+  create_table "daily_tables", :force => true do |t|
     t.integer  "user_id"
-    t.text     "data"
-    t.string   "data_type"
+    t.text     "metric_data"
+    t.string   "metric"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "name"
@@ -58,7 +41,7 @@ ActiveRecord::Schema.define(:version => 20111214020029) do
     t.text     "transform_data"
   end
 
-  create_table "users", :force => true do |t|
+  create_table "daily_users", :force => true do |t|
     t.string   "email",                                 :default => "", :null => false
     t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
     t.string   "reset_password_token"
@@ -74,7 +57,25 @@ ActiveRecord::Schema.define(:version => 20111214020029) do
     t.boolean  "admin"
   end
 
-  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
-  add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+  add_index "daily_users", ["email"], :name => "index_users_on_email", :unique => true
+  add_index "daily_users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0
+    t.integer  "attempts",   :default => 0
+    t.text     "handler"
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "report_id"
+    t.string   "queue"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+  add_index "delayed_jobs", ["report_id"], :name => "index_delayed_jobs_on_report_id"
 
 end

data/lib/daily.rb

@@ -17,12 +17,12 @@ require 'ruport/util'
 require 'dbi'
 require 'dbd/mysql'
 
-require "daily/engine"
+require "daily/activemetric"
+
 require "daily/daily_config"
 require "daily/shared_behaviors"
 require "daily/has_data"
 
-Authorization::AUTH_DSL_FILES = [Pathname.new(Daily::Engine.root || '').join("config", "authorization_rules.rb").to_s]
+require "engine/engine"
 
-module Daily
-end
+Authorization::AUTH_DSL_FILES = [Pathname.new(Daily::Engine.root || '').join("config", "authorization_rules.rb").to_s]

data/lib/daily/activemetric.rb

@@ -0,0 +1,5 @@
+module ActiveMetric
+  class Base < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

data/lib/daily/daily_config.rb

@@ -2,8 +2,6 @@ module DailyConfig
   extend self
   
   def set_root(root)
-    puts "here it is.........."
-    puts root
     @root = root
   end
   def set_env(env)
@@ -33,13 +31,20 @@ module DailyConfig
     hash['subdirectory'] || env_hash['subdirectory'] || ""
   end
   
+  def database_config
+    env_hash['database']
+  end
+  
   def database_init
-    db = env_hash['database']
+    db = database_config
     return if db.empty?
     Ruport::Query.add_source :default,
                              :dsn => "dbi:#{db['adapter'].camelize}:database=#{db['database']};host=#{db['host']}", 
                              :user => "#{db['username']}",
                              :password => "#{db['password']}"
+                             
+    require File.expand_path('../activemetric', __FILE__)
+    ActiveMetric::Base.establish_connection db
   end
   
   def config_init(config)
@@ -48,4 +53,16 @@ module DailyConfig
     end
   end
   
+  def load_classes
+    Dir[Rails.root.join("app/transforms/*")].each { |f| require_dependency f }
+    Dir[Rails.root.join("app/formatters/*")].each { |f| require_dependency f }
+    Dir[Rails.root.join("app/metrics/*")].each    { |f| require_dependency f }
+
+    if defined? Daily::Engine
+      Dir[Daily::Engine.root.join("app/transforms/*")].each { |f| require_dependency f }
+      Dir[Daily::Engine.root.join("app/formatters/*")].each { |f| require_dependency f }
+      Dir[Daily::Engine.root.join("app/metrics/*")].each    { |f| require_dependency f }
+    end
+  end
+  
 end

data/lib/daily/version.rb

@@ -1,3 +1,3 @@
 module Daily
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/tasks/user.rake

@@ -1,7 +1,7 @@
 namespace :user do
 	desc "Create a user given email and password"
 	task :create, [:email, :password] => :environment do |t, args|
-	  user = User.new(:email => args[:email], :password => args[:password])
+	  user = DailyUser.new(:email => args[:email], :password => args[:password])
 	  if user.save
 	    puts "User #{user.email} created!"
     else
@@ -9,7 +9,7 @@ namespace :user do
     end
   end
   task :admin, [:email, :password] => [:environment, :create] do |t, args|
-    user = User.find_by_email(args[:email])
+    user = DailyUser.find_by_email(args[:email])
     if user
       user.admin = true
       if user.save

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daily
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Brian Leonard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 -08:00
+date: 2012-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -147,7 +147,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: ruport
+  name: daemons
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -161,7 +161,7 @@ dependencies:
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: ruport-util
+  name: ruport
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -175,7 +175,7 @@ dependencies:
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: dbi
+  name: ruport-util
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -189,7 +189,7 @@ dependencies:
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: dbd-mysql
+  name: dbi
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
@@ -203,7 +203,7 @@ dependencies:
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: database_cleaner
+  name: dbd-mysql
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
@@ -214,10 +214,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: database_cleaner
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
@@ -231,7 +231,7 @@ dependencies:
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: mocha
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
@@ -245,7 +245,7 @@ dependencies:
   type: :development
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: factory_girl_rails
+  name: shoulda
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
@@ -259,7 +259,7 @@ dependencies:
   type: :development
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: factory_girl_rails
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
@@ -273,7 +273,7 @@ dependencies:
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: launchy
+  name: capybara
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
@@ -287,7 +287,7 @@ dependencies:
   type: :development
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: timecop
+  name: launchy
   prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
@@ -301,7 +301,7 @@ dependencies:
   type: :development
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: timecop
   prerelease: false
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
@@ -315,7 +315,7 @@ dependencies:
   type: :development
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: rspec-rails
   prerelease: false
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
@@ -328,6 +328,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id022
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id023
 description: Reporting application
 email: 
 - brian@bleonard.com
@@ -343,43 +357,45 @@ files:
 - app/assets/stylesheets/application.css
 - app/assets/stylesheets/bootstrap.css
 - app/controllers/application_controller.rb
+- app/controllers/daily_reports_controller.rb
+- app/controllers/daily_tables_controller.rb
+- app/controllers/daily_users_controller.rb
 - app/controllers/files_controller.rb
 - app/controllers/main_controller.rb
-- app/controllers/reports_controller.rb
-- app/controllers/tables_controller.rb
-- app/controllers/users_controller.rb
 - app/formatters/html_formatter.rb
 - app/formatters/json_formatter.rb
 - app/helpers/application_helper.rb
 - app/jobs/generate_report_job.rb
-- app/models/report.rb
-- app/models/table.rb
-- app/models/user.rb
+- app/metrics/metric.rb
+- app/metrics/sql_query.rb
+- app/models/daily_report.rb
+- app/models/daily_table.rb
+- app/models/daily_user.rb
 - app/transforms/column_filter.rb
 - app/transforms/moving_average.rb
 - app/transforms/transform.rb
+- app/views/daily_reports/_form.erb
+- app/views/daily_reports/_list.erb
+- app/views/daily_reports/edit.erb
+- app/views/daily_reports/index.erb
+- app/views/daily_reports/new.erb
+- app/views/daily_reports/show.erb
+- app/views/daily_tables/_form.erb
+- app/views/daily_tables/_list.erb
+- app/views/daily_tables/edit.erb
+- app/views/daily_tables/index.erb
+- app/views/daily_tables/new.erb
+- app/views/daily_tables/show.erb
+- app/views/daily_users/_form.erb
+- app/views/daily_users/_items.erb
+- app/views/daily_users/_list.erb
+- app/views/daily_users/edit.erb
+- app/views/daily_users/index.erb
+- app/views/daily_users/new.erb
+- app/views/daily_users/show.erb
 - app/views/devise/sessions/new.erb
 - app/views/layouts/application.html.erb
 - app/views/main/home.erb
-- app/views/reports/_form.erb
-- app/views/reports/_list.erb
-- app/views/reports/edit.erb
-- app/views/reports/index.erb
-- app/views/reports/new.erb
-- app/views/reports/show.erb
-- app/views/tables/_form.erb
-- app/views/tables/_list.erb
-- app/views/tables/edit.erb
-- app/views/tables/index.erb
-- app/views/tables/new.erb
-- app/views/tables/show.erb
-- app/views/users/_form.erb
-- app/views/users/_items.erb
-- app/views/users/_list.erb
-- app/views/users/edit.erb
-- app/views/users/index.erb
-- app/views/users/new.erb
-- app/views/users/show.erb
 - config/application.rb
 - config/authorization_rules.rb
 - config/boot.rb
@@ -418,15 +434,18 @@ files:
 - db/migrate/20111203020425_add_transform_to_table.rb
 - db/migrate/20111214020029_add_formatter_data_to_reports.rb
 - db/migrate/20120110075743_add_queue_to_delayed_jobs.rb
+- db/migrate/20120111054115_create_table_metrics.rb
+- db/migrate/20120111081745_namespace_models.rb
 - db/schema.rb
 - db/seeds.rb
 - db/test.sqlite3
+- lib/daily/activemetric.rb
 - lib/daily/daily_config.rb
-- lib/daily/engine.rb
 - lib/daily/has_data.rb
 - lib/daily/shared_behaviors.rb
 - lib/daily/version.rb
 - lib/daily.rb
+- lib/engine/engine.rb
 - lib/tasks/user.rake
 - MIT-LICENSE
 - Rakefile